From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Drop unmaintained SBC kernels
Date: Wed, 09 Dec 2020 04:42:58 +0100 [thread overview]
Message-ID: <20201209034258.fx4rWoS2wBSjJIUpsezFndfbg7e1_V4uUa45B782_io@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27038@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages drops
https://github.com/void-linux/void-packages/pull/27038
Drop unmaintained SBC kernels
A patch file from https://github.com/void-linux/void-packages/pull/27038.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-drops-27038.patch --]
[-- Type: text/x-diff, Size: 26719 bytes --]
From c62504d052ca2e624c35489a79f3e7b202017030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 8 Dec 2020 17:26:27 -0300
Subject: [PATCH 1/7] usbarmory-u-boot: remove package.
---
.../patches/include-sys-types.patch | 41 -------------------
.../patches/partition_layout.patch | 22 ----------
srcpkgs/usbarmory-u-boot/template | 33 ---------------
srcpkgs/usbarmory-u-boot/update | 1 -
4 files changed, 97 deletions(-)
delete mode 100644 srcpkgs/usbarmory-u-boot/patches/include-sys-types.patch
delete mode 100644 srcpkgs/usbarmory-u-boot/patches/partition_layout.patch
delete mode 100644 srcpkgs/usbarmory-u-boot/template
delete mode 100644 srcpkgs/usbarmory-u-boot/update
diff --git a/srcpkgs/usbarmory-u-boot/patches/include-sys-types.patch b/srcpkgs/usbarmory-u-boot/patches/include-sys-types.patch
deleted file mode 100644
index 2f1ffe310eb..00000000000
--- a/srcpkgs/usbarmory-u-boot/patches/include-sys-types.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- include/image.h
-+++ include/image.h
-@@ -24,6 +24,8 @@
-
- #ifdef USE_HOSTCC
-
-+#include <sys/types.h>
-+
- /* new uImage format support enabled on host */
- #define CONFIG_FIT 1
- #define CONFIG_OF_LIBFDT 1
---- tools/imagetool.h
-+++ tools/imagetool.h
-@@ -16,6 +16,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
- #include <time.h>
- #include <unistd.h>
- #include <u-boot/sha1.h>
---- tools/mkimage.h
-+++ tools/mkimage.h
-@@ -16,6 +16,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
- #include <time.h>
- #include <unistd.h>
- #include <u-boot/sha1.h>
---- tools/proftool.c
-+++ tools/proftool.c
-@@ -16,6 +16,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/param.h>
-+#include <sys/types.h>
-
- #include <compiler.h>
- #include <trace.h>
diff --git a/srcpkgs/usbarmory-u-boot/patches/partition_layout.patch b/srcpkgs/usbarmory-u-boot/patches/partition_layout.patch
deleted file mode 100644
index 218ef57ef36..00000000000
--- a/srcpkgs/usbarmory-u-boot/patches/partition_layout.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/configs/usbarmory.h.orig 2015-04-29 15:11:43.064537918 +0200
-+++ include/configs/usbarmory.h 2015-04-29 15:32:04.900446472 +0200
-@@ -82,8 +82,8 @@
- #define CONFIG_BOOTCOMMAND \
- "run distro_bootcmd; " \
- "setenv bootargs console=${console} ${bootargs_default}; " \
-- "ext2load mmc 0:1 ${kernel_addr_r} /boot/uImage; " \
-- "ext2load mmc 0:1 ${fdt_addr_r} /boot/${fdtfile}; " \
-+ "fatload mmc 0:1 ${kernel_addr_r} /uImage; " \
-+ "fatload mmc 0:1 ${fdt_addr_r} /${fdtfile}; " \
- "bootm ${kernel_addr_r} - ${fdt_addr_r}"
-
- #define BOOT_TARGET_DEVICES(func) func(MMC, mmc, 0)
-@@ -99,7 +99,7 @@
-
- #define CONFIG_EXTRA_ENV_SETTINGS \
- MEM_LAYOUT_ENV_SETTINGS \
-- "bootargs_default=root=/dev/mmcblk0p1 rootwait rw\0" \
-+ "bootargs_default=root=/dev/mmcblk0p2 rootwait rw\0" \
- "fdtfile=imx53-usbarmory.dtb\0" \
- "console=ttymxc0,115200\0" \
- BOOTENV
diff --git a/srcpkgs/usbarmory-u-boot/template b/srcpkgs/usbarmory-u-boot/template
deleted file mode 100644
index 06d6263c13b..00000000000
--- a/srcpkgs/usbarmory-u-boot/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'usbarmory-uboot'
-pkgname=usbarmory-u-boot
-version=2015.04
-revision=3
-wrksrc="u-boot-$version"
-hostmakedepends="uboot-mkimage bc"
-short_desc="USB armory U-Boot files for SD booting"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://github.com/hardkernel/u-boot"
-distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-$version.tar.bz2"
-checksum="0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60"
-
-archs="armv7l*"
-
-do_configure() {
- make distclean
- make usbarmory_config
-}
-
-do_build() {
- unset CFLAGS CXXFLAGS LDFLAGS
-
- if [ "$CROSS_BUILD" ]; then
- make ARCH=arm CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-
- else
- make ARCH=arm
- fi
-}
-
-do_install() {
- vinstall u-boot.imx 600 boot
-}
diff --git a/srcpkgs/usbarmory-u-boot/update b/srcpkgs/usbarmory-u-boot/update
deleted file mode 100644
index a4f0ca17b6c..00000000000
--- a/srcpkgs/usbarmory-u-boot/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=u-boot
From c403635639fe07971094ddc4f186329385869927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 8 Dec 2020 17:26:48 -0300
Subject: [PATCH 2/7] usbarmory-kernel: remove package.
---
srcpkgs/usbarmory-kernel-headers | 1 -
...ing-ref-leak-in-join_session_keyring.patch | 75 ---------
srcpkgs/usbarmory-kernel/template | 153 ------------------
srcpkgs/usbarmory-kernel/update | 2 -
4 files changed, 231 deletions(-)
delete mode 120000 srcpkgs/usbarmory-kernel-headers
delete mode 100644 srcpkgs/usbarmory-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
delete mode 100644 srcpkgs/usbarmory-kernel/template
delete mode 100644 srcpkgs/usbarmory-kernel/update
diff --git a/srcpkgs/usbarmory-kernel-headers b/srcpkgs/usbarmory-kernel-headers
deleted file mode 120000
index 5ef7c3f0126..00000000000
--- a/srcpkgs/usbarmory-kernel-headers
+++ /dev/null
@@ -1 +0,0 @@
-usbarmory-kernel
\ No newline at end of file
diff --git a/srcpkgs/usbarmory-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/srcpkgs/usbarmory-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
deleted file mode 100644
index c4f6ca2b4c0..00000000000
--- a/srcpkgs/usbarmory-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7ca88764d45c209791e8813131c1457c2e9e51e7 Mon Sep 17 00:00:00 2001
-From: Yevgeny Pats <yevgeny@perception-point.io>
-Date: Mon, 11 Jan 2016 12:05:28 +0000
-Subject: KEYS: Fix keyring ref leak in join_session_keyring()
-
-If a thread is asked to join as a session keyring the keyring that's already
-set as its session, we leak a keyring reference.
-
-This can be tested with the following program:
-
- #include <stddef.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <keyutils.h>
-
- int main(int argc, const char *argv[])
- {
- int i = 0;
- key_serial_t serial;
-
- serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
- "leaked-keyring");
- if (serial < 0) {
- perror("keyctl");
- return -1;
- }
-
- if (keyctl(KEYCTL_SETPERM, serial,
- KEY_POS_ALL | KEY_USR_ALL) < 0) {
- perror("keyctl");
- return -1;
- }
-
- for (i = 0; i < 100; i++) {
- serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
- "leaked-keyring");
- if (serial < 0) {
- perror("keyctl");
- return -1;
- }
- }
-
- return 0;
- }
-
-If, after the program has run, there something like the following line in
-/proc/keys:
-
-3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty
-
-with a usage count of 100 * the number of times the program has been run,
-then the kernel is malfunctioning. If leaked-keyring has zero usages or
-has been garbage collected, then the problem is fixed.
-
-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- security/keys/process_keys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git security/keys/process_keys.c security/keys/process_keys.c
-index a3f85d2..e6d50172 100644
---- security/keys/process_keys.c
-+++ security/keys/process_keys.c
-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
- ret = PTR_ERR(keyring);
- goto error2;
- } else if (keyring == new->session_keyring) {
-+ key_put(keyring);
- ret = 0;
- goto error2;
- }
---
-2.7.0.rc3
-
diff --git a/srcpkgs/usbarmory-kernel/template b/srcpkgs/usbarmory-kernel/template
deleted file mode 100644
index 6d7fb533169..00000000000
--- a/srcpkgs/usbarmory-kernel/template
+++ /dev/null
@@ -1,153 +0,0 @@
-# Template file for 'usbarmory-kernel'
-pkgname=usbarmory-kernel
-version=4.2.6
-revision=2
-_configrev=1952b30fcaa9a4e22f63fe22e033d312f491a11e
-wrksrc="linux-${version}"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://inversepath.com/usbarmory"
-license="GPL-2"
-short_desc="The Linux kernel and modules for the Inversepath USB armory"
-distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz
- https://github.com/inversepath/usbarmory/archive/$_configrev.tar.gz"
-checksum="17db6b7dc0061135df39b376e325d01152df4087253e9563e1c7ceb4c736fb5c
- cddb30b47b3aa0fe5a012167d64d18110869c9055a0c2803ad8268cd297ce2db"
-
-nodebug=yes
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-
-archs="armv7l*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
-makedepends="ncurses-devel"
-triggers="kernel-hooks"
-
-_kernver="${version}_${revision}"
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-do_configure() {
- cp $XBPS_BUILDDIR/usbarmory-$_configrev/software/kernel_conf/usbarmory_linux-${version%.*}.config .config
- cp $XBPS_BUILDDIR/usbarmory-$_configrev/software/kernel_conf/imx53-usbarmory* arch/arm/boot/dts
-
- # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
- sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
- if [ "$CROSS_BUILD" ]; then
- _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
- fi
- make ${makejobs} ${_args} ARCH=arm prepare
- make ${makejobs} ${_args} ARCH=arm uImage LOADADDR=0x70008000 modules imx53-usbarmory.dtb
-}
-do_install() {
- local hdrdest
-
- # Run depmod after compressing modules.
- sed -i '2iexit 0' scripts/depmod.sh
-
- # Install kernel, firmware and modules
- make ${makejobs} ARCH=arm INSTALL_MOD_PATH=${DESTDIR} modules_install
-
- vmkdir boot
- mv arch/arm/boot/uImage ${DESTDIR}/boot
- mv arch/arm/boot/dts/imx53-usbarmory.dtb ${DESTDIR}/boot
-
- hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
-
- # Switch to /usr.
- vmkdir usr
- mv ${DESTDIR}/lib ${DESTDIR}/usr
-
- cd ${DESTDIR}/usr/lib/modules/${_kernver}
- rm -f source build
- ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
-
- cd ${wrksrc}
- # Install required headers to build external modules
- install -Dm644 Makefile ${hdrdest}/Makefile
- install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
- install -Dm644 .config ${hdrdest}/.config
- mkdir -p ${hdrdest}/include
-
- # Remove firmware stuff provided by the "linux-firmware" pkg.
- rm -rf ${DESTDIR}/usr/lib/firmware
-
- for i in acpi asm-generic config crypto drm generated linux math-emu \
- media net pcmcia scsi sound trace uapi video xen; do
- [ -d include/$i ] && cp -a include/$i ${hdrdest}/include
- done
-
- cd ${wrksrc}
- # Copy files necessary for later builds.
- cp Module.symvers ${hdrdest}
- cp -a scripts ${hdrdest}
-
- # fix permissions on scripts dir
- chmod og-w -R ${hdrdest}/scripts
-
- # copy arch includes for external modules
- mkdir -p ${hdrdest}/arch/arm/mach-imx
- cp -a arch/arm/include ${hdrdest}/arch/arm
-
- mkdir -p ${hdrdest}/arch/arm/kernel
-
- cp arch/arm/Makefile ${hdrdest}/arch/arm
- cp arch/arm/kernel/asm-offsets.s ${hdrdest}/arch/arm/kernel
-
- # Add docbook makefile
- install -Dm644 Documentation/DocBook/Makefile \
- ${hdrdest}/Documentation/DocBook/Makefile
-
- # Add md headers
- mkdir -p ${hdrdest}/drivers/md
- cp drivers/md/*.h ${hdrdest}/drivers/md
-
- # Add inotify.h
- mkdir -p ${hdrdest}/include/linux
- cp include/linux/inotify.h ${hdrdest}/include/linux
-
- # Add wireless headers
- mkdir -p ${hdrdest}/net/mac80211/
- cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
- # Copy in Kconfig files
- for i in $(find . -name "Kconfig*"); do
- mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
- cp $i ${hdrdest}/$i
- done
-
- # Remove unneeded architectures
- for arch in alpha arm26 avr32 blackfin cris frv h8300 \
- ia64 m* p* s* um v850 x86 xtensa; do
- rm -rf ${hdrdest}/arch/${arch}
- done
-
- # Compress all modules with xz to save a few MBs.
- msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
- find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
-
- # ... and run depmod again.
- depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-
-usbarmory-kernel-headers_package() {
- nostrip=yes
- noverifyrdeps=yes
- noshlibprovides=yes
- short_desc="The Linux kernel headers for the Inversepath USB armory"
- pkg_install() {
- vmove usr/src
- vmove usr/lib/modules/${_kernver}/build
- }
-}
diff --git a/srcpkgs/usbarmory-kernel/update b/srcpkgs/usbarmory-kernel/update
deleted file mode 100644
index a951912995f..00000000000
--- a/srcpkgs/usbarmory-kernel/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.kernel.org/pub/linux/kernel/v4.x/"
-pattern="linux-\K[\d.]+(?=\.tar)"
From 00afb2c9bf5cd8e727cd74792f42e1f801a68537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 8 Dec 2020 17:27:01 -0300
Subject: [PATCH 3/7] usbarmory-base: remove package.
---
srcpkgs/usbarmory-base/INSTALL | 9 -------
srcpkgs/usbarmory-base/files/dhcpcd-usb0.conf | 5 ----
srcpkgs/usbarmory-base/files/dhcpcd-usb0/run | 3 ---
srcpkgs/usbarmory-base/template | 24 -------------------
4 files changed, 41 deletions(-)
delete mode 100644 srcpkgs/usbarmory-base/INSTALL
delete mode 100644 srcpkgs/usbarmory-base/files/dhcpcd-usb0.conf
delete mode 100755 srcpkgs/usbarmory-base/files/dhcpcd-usb0/run
delete mode 100644 srcpkgs/usbarmory-base/template
diff --git a/srcpkgs/usbarmory-base/INSTALL b/srcpkgs/usbarmory-base/INSTALL
deleted file mode 100644
index a0984d66e98..00000000000
--- a/srcpkgs/usbarmory-base/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "$ACTION" in
-post)
- # enable sshd, ntpdate, ntpd and dhcpcd services.
- mkdir -p etc/runit/runsvdir/default/
- ln -sf /etc/sv/sshd etc/runit/runsvdir/default/
- ln -sf /etc/sv/ntpd etc/runit/runsvdir/default/
- ln -sf /etc/sv/dhcpcd-usb0 etc/runit/runsvdir/default/
- ;;
-esac
diff --git a/srcpkgs/usbarmory-base/files/dhcpcd-usb0.conf b/srcpkgs/usbarmory-base/files/dhcpcd-usb0.conf
deleted file mode 100644
index 4f652367eb1..00000000000
--- a/srcpkgs/usbarmory-base/files/dhcpcd-usb0.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Static IP configuration.
-interface usb0
-static ip_address=10.0.0.1
-static routers=10.0.0.2
-static domain_name_servers=8.8.8.8 8.8.4.4
diff --git a/srcpkgs/usbarmory-base/files/dhcpcd-usb0/run b/srcpkgs/usbarmory-base/files/dhcpcd-usb0/run
deleted file mode 100755
index 15576af0172..00000000000
--- a/srcpkgs/usbarmory-base/files/dhcpcd-usb0/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-[ -r conf ] && . ./conf
-exec dhcpcd ${OPTS:=-f /etc/dhcpcd-usb0.conf} 1>&2
diff --git a/srcpkgs/usbarmory-base/template b/srcpkgs/usbarmory-base/template
deleted file mode 100644
index 20e506a3617..00000000000
--- a/srcpkgs/usbarmory-base/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'usbarmory-base'
-pkgname=usbarmory-base
-version=1.0
-revision=3
-short_desc="Void Linux USBarmory base files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public Domain"
-homepage="http://www.voidlinux.org"
-
-archs="armv7l*"
-depends="virtual?ntp-daemon usbarmory-u-boot usbarmory-kernel"
-
-do_install() {
- # load LED, CI HDRC i.MX USB binding, and g_ether driver
- vmkdir usr/lib/modules-load.d
- vmkdir usr/lib/modprobe.d
- echo 'options g_ether use_eem=0 dev_addr=1a:55:89:a2:69:41 host_addr=1a:55:89:a2:69:42' > ${DESTDIR}/usr/lib/modprobe.d/g_ether.conf
- for m in ledtrig_heartbeat ci_hdrc_imx g_ether; do
- echo "$m" > ${DESTDIR}/usr/lib/modules-load.d/${m%% *}.conf
- done
-
- vconf ${FILESDIR}/dhcpcd-usb0.conf
- vsv dhcpcd-usb0
-}
From 151980d0cd4f3bed0a331a7e16a7e06d43e412d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 8 Dec 2020 17:27:20 -0300
Subject: [PATCH 4/7] kirkwood-kernel: remove package.
---
srcpkgs/kirkwood-kernel-headers | 1 -
srcpkgs/kirkwood-kernel/template | 164 -------------------------------
2 files changed, 165 deletions(-)
delete mode 120000 srcpkgs/kirkwood-kernel-headers
delete mode 100644 srcpkgs/kirkwood-kernel/template
diff --git a/srcpkgs/kirkwood-kernel-headers b/srcpkgs/kirkwood-kernel-headers
deleted file mode 120000
index 91bc4daa491..00000000000
--- a/srcpkgs/kirkwood-kernel-headers
+++ /dev/null
@@ -1 +0,0 @@
-kirkwood-kernel
\ No newline at end of file
diff --git a/srcpkgs/kirkwood-kernel/template b/srcpkgs/kirkwood-kernel/template
deleted file mode 100644
index 4a07016ed76..00000000000
--- a/srcpkgs/kirkwood-kernel/template
+++ /dev/null
@@ -1,164 +0,0 @@
-# Template file for 'kirkwood-kernel'
-pkgname=kirkwood-kernel
-version=4.1.36
-revision=1
-wrksrc="linux-${version}"
-maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.kernel.org/"
-license="GPL-2"
-short_desc="The Linux kernel and modules for kirkwood"
-_commit="e2827e1b7fde0280099b9f8ea2d85a5b67bcaf37"
-distfiles="${KERNEL_SITE}/kernel/v4.x/linux-${version}.tar.xz
-http://www.arm.linux.org.uk/developer/machines/download.php>mach-types
-https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/${_commit}/core/linux-kirkwood/archlinuxarm.patch
-https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/${_commit}/core/linux-kirkwood/config"
-skip_extraction="mach-types archlinuxarm.patch config"
-checksum="
-e1526ddf1222a89399f0d0b0921c46fe727812571dd3a7f42be9f03472f11590
-c15df9ace627319a856b31cef4458ccccbd373d19a427fa9f0ad474291943904
-53259fb05cb3903c5215da33426a654e3f212756cce155363decf8dc5ed7751e
-1a6825cf6467604138e25c806cd9ff5b964894dbafc1f6a97fe8386c45f644bd"
-
-nodebug=yes
-nostrip=yes
-noverifyrdeps=yes
-noshlibprovides=yes
-
-archs="armv5tel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
-makedepends="ncurses-devel"
-triggers="kernel-hooks"
-
-_kernver="${version}_${revision}"
-# These files could be modified when an external module is built.
-mutable_files="
- /usr/lib/modules/${_kernver}/modules.builtin.bin
- /usr/lib/modules/${_kernver}/modules.softdep
- /usr/lib/modules/${_kernver}/modules.dep
- /usr/lib/modules/${_kernver}/modules.dep.bin
- /usr/lib/modules/${_kernver}/modules.symbols
- /usr/lib/modules/${_kernver}/modules.symbols.bin
- /usr/lib/modules/${_kernver}/modules.alias
- /usr/lib/modules/${_kernver}/modules.alias.bin
- /usr/lib/modules/${_kernver}/modules.devname"
-
-post_extract() {
- local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
- cp "${srcdir}/mach-types" arch/arm/tools
- patch -p1 < "${srcdir}/archlinuxarm.patch"
-}
-do_configure() {
- local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
- cp ${srcdir}/config .config
-
- # Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
- sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
-}
-do_build() {
- if [ "$CROSS_BUILD" ]; then
- _args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
- fi
- make ${makejobs} ${_args} ARCH=arm prepare
- make ${makejobs} ${_args} ARCH=arm uImage modules
-}
-
-do_install() {
- local hdrdest
-
- # Run depmod after compressing modules.
- sed -i '2iexit 0' scripts/depmod.sh
-
- # Install kernel, firmware and modules
- make ${makejobs} ARCH=arm INSTALL_MOD_PATH=${DESTDIR} modules_install
-
- vmkdir boot
- mv arch/arm/boot/uImage ${DESTDIR}/boot
-
- hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
-
- # Switch to /usr.
- vmkdir usr
- mv ${DESTDIR}/lib ${DESTDIR}/usr
-
- cd ${DESTDIR}/usr/lib/modules/${_kernver}
- rm -f source build
- ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
-
- cd ${wrksrc}
- # Install required headers to build external modules
- install -Dm644 Makefile ${hdrdest}/Makefile
- install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
- install -Dm644 .config ${hdrdest}/.config
- mkdir -p ${hdrdest}/include
-
- # Remove firmware stuff provided by the "linux-firmware" pkg.
- rm -rf ${DESTDIR}/usr/lib/firmware
-
- for i in acpi asm-generic config crypto drm generated linux math-emu \
- media net pcmcia scsi sound trace uapi video xen; do
- [ -d include/$i ] && cp -a include/$i ${hdrdest}/include
- done
-
- cd ${wrksrc}
- # Copy files necessary for later builds.
- cp Module.symvers ${hdrdest}
- cp -a scripts ${hdrdest}
-
- # fix permissions on scripts dir
- chmod og-w -R ${hdrdest}/scripts
-
- # copy arch includes for external modules
- mkdir -p ${hdrdest}/arch/arm/mach-kirkwood
- cp -a arch/arm/include ${hdrdest}/arch/arm
-
- mkdir -p ${hdrdest}/arch/arm/kernel
-
- cp arch/arm/Makefile ${hdrdest}/arch/arm
- cp arch/arm/kernel/asm-offsets.s ${hdrdest}/arch/arm/kernel
-
- # Add docbook makefile
- install -Dm644 Documentation/DocBook/Makefile \
- ${hdrdest}/Documentation/DocBook/Makefile
-
- # Add md headers
- mkdir -p ${hdrdest}/drivers/md
- cp drivers/md/*.h ${hdrdest}/drivers/md
-
- # Add inotify.h
- mkdir -p ${hdrdest}/include/linux
- cp include/linux/inotify.h ${hdrdest}/include/linux
-
- # Add wireless headers
- mkdir -p ${hdrdest}/net/mac80211/
- cp net/mac80211/*.h ${hdrdest}/net/mac80211
-
- # Copy in Kconfig files
- for i in $(find . -name "Kconfig*"); do
- mkdir -p ${hdrdest}/$(echo $i | sed 's|/Kconfig.*||')
- cp $i ${hdrdest}/$i
- done
-
- # Remove unneeded architectures
- for arch in alpha arm26 avr32 blackfin cris frv h8300 \
- ia64 m* p* s* um v850 x86 xtensa; do
- rm -rf ${hdrdest}/arch/${arch}
- done
-
- # Compress all modules with xz to save a few MBs.
- msg_normal "$pkgver: compressing kernel modules with gzip, please wait...\n"
- find ${DESTDIR} -name '*.ko' | xargs -n1 -P0 gzip -9
-
- # ... and run depmod again.
- depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
-}
-
-kirkwood-kernel-headers_package() {
- nostrip=yes
- noverifyrdeps=yes
- noshlibprovides=yes
- short_desc="The Linux kernel headers for the kirkwood platform"
- pkg_install() {
- vmove usr/src
- vmove usr/lib/modules/${_kernver}/build
- }
-}
From 97b2079b2ea8d05eec471790ced0c559daf054bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 9 Dec 2020 00:23:37 -0300
Subject: [PATCH 5/7] dockstar-uboot: remove package.
---
srcpkgs/dockstar-uboot/template | 31 -------------------------------
srcpkgs/dockstar-uboot/update | 2 --
2 files changed, 33 deletions(-)
delete mode 100644 srcpkgs/dockstar-uboot/template
delete mode 100644 srcpkgs/dockstar-uboot/update
diff --git a/srcpkgs/dockstar-uboot/template b/srcpkgs/dockstar-uboot/template
deleted file mode 100644
index 6353288858d..00000000000
--- a/srcpkgs/dockstar-uboot/template
+++ /dev/null
@@ -1,31 +0,0 @@
-# Template file for 'kirkwood-uboot'
-pkgname=dockstar-uboot
-version=4
-revision=1
-wrksrc="u-boot-R${version##*.}"
-archs="armv5tel"
-short_desc="(archlinuxarm) u-boot compiled for dockstar"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-3"
-homepage="https://github.com/archlinuxarm/u-boot"
-distfiles="https://github.com/archlinuxarm/u-boot/archive/R$version.tar.gz http://archlinuxarm.org/os/armv5te/boot/dockstar/uboot-dockstar.env"
-checksum="22492ec730f0e91e4f732d8793cea39fb5945386eb46e86f3d8446978361c551 ec6522fdb74a41bc2b6f301729c421c9600be1a479bf7932405b39d2f459ada7"
-skip_extraction="uboot-dockstar.env"
-
-do_configure() {
- make dockstar_config
-}
-do_build() {
- unset CFLAGS CXXFLAGS LDFLAGS
- if [ "$CROSS_BUILD" ]; then
- make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- u-boot.kwb
- else
- make u-boot.kwb
- fi
- dd if=u-boot.kwb of=uboot-dockstar.kwb bs=512k conv=sync
-}
-do_install() {
- local srcdir="$XBPS_SRCDISTDIR/$pkgname-$version"
- vinstall uboot-dockstar.kwb 755 boot
- vinstall ${srcdir}/uboot-dockstar.env 644 boot
-}
diff --git a/srcpkgs/dockstar-uboot/update b/srcpkgs/dockstar-uboot/update
deleted file mode 100644
index bda11b31f07..00000000000
--- a/srcpkgs/dockstar-uboot/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://api.github.com/repos/archlinuxarm/u-boot/tags"
-pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
From 06bb0be4d8879a86942dba6ef0a8e86e691a401f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 9 Dec 2020 00:23:44 -0300
Subject: [PATCH 6/7] dockstar-base: remove package.
---
srcpkgs/dockstar-base/INSTALL | 8 --------
srcpkgs/dockstar-base/template | 12 ------------
2 files changed, 20 deletions(-)
delete mode 100644 srcpkgs/dockstar-base/INSTALL
delete mode 100644 srcpkgs/dockstar-base/template
diff --git a/srcpkgs/dockstar-base/INSTALL b/srcpkgs/dockstar-base/INSTALL
deleted file mode 100644
index b31894af778..00000000000
--- a/srcpkgs/dockstar-base/INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-case "$ACTION" in
-post)
- mkdir -p etc/runit/runsvdir/default/
- ln -s /etc/sv/sshd etc/runit/runsvdir/default/
- ln -s /etc/sv/ntpd etc/runit/runsvdir/default/
- ln -s /etc/sv/dhcpcd etc/runit/runsvdir/default/
- ;;
-esac
diff --git a/srcpkgs/dockstar-base/template b/srcpkgs/dockstar-base/template
deleted file mode 100644
index 951abef1926..00000000000
--- a/srcpkgs/dockstar-base/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'dockstar-base'
-pkgname=dockstar-base
-version=1
-revision=1
-build_style=meta
-homepage="http://www.voidlinux.org"
-short_desc="Void Linux Dockstar platform package"
-maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="Public Domain"
-
-archs="armv5tel"
-depends="virtual?ntp-daemon kirkwood-kernel linux-firmware-network dockstar-uboot"
From 7b6893c41aab99b6b791df0304fed062b8bb38b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 9 Dec 2020 00:42:48 -0300
Subject: [PATCH 7/7] pogoplugv4-base: remove package.
---
srcpkgs/pogoplugv4-base/template | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 srcpkgs/pogoplugv4-base/template
diff --git a/srcpkgs/pogoplugv4-base/template b/srcpkgs/pogoplugv4-base/template
deleted file mode 100644
index cb1428ef35e..00000000000
--- a/srcpkgs/pogoplugv4-base/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'pogoplugv4-base'
-pkgname=pogoplugv4-base
-version=1
-revision=1
-build_style=meta
-short_desc="Base package for the PogoPlug Series 4 devices (kirkwood)"
-homepage="http://pogoplug.com"
-maintainer="Michael Aldridge <aldridge.mac@gmail.com>"
-license="GPL-3"
-
-# The kirkwood devices are all armv5tel based
-archs="armv5tel*"
-depends="linux dracut uboot-mkimage runit-void base-voidstrap"
next prev parent reply other threads:[~2020-12-09 3:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 20:27 [PR PATCH] " ericonr
2020-12-09 3:24 ` [PR PATCH] [Updated] " ericonr
2020-12-09 3:30 ` ericonr
2020-12-09 3:42 ` ericonr [this message]
2020-12-10 5:46 ` the-maldridge
2020-12-10 5:46 ` [PR PATCH] [Merged]: " the-maldridge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201209034258.fx4rWoS2wBSjJIUpsezFndfbg7e1_V4uUa45B782_io@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).