diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2023-12-25 13:10:07 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2023-12-25 13:10:23 +0100 |
| commit | 8c1f4537e54b2a9bf102d0cebcf2fd28e4c4c0bb (patch) | |
| tree | 71c2e5aa1bed4d4094d271021cd0ccd043e1fb74 | |
| parent | 2cca7734d07f70089caef6fead85f1f5e33ae117 (diff) | |
| download | aports-8c1f4537e54b2a9bf102d0cebcf2fd28e4c4c0bb.zip | |
main/alpine-conf: upgrade to 3.17.1
| -rw-r--r-- | main/alpine-conf/0001-update-kernel-support-more-System.map-and-config-fil.patch | 47 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 8 |
2 files changed, 3 insertions, 52 deletions
diff --git a/main/alpine-conf/0001-update-kernel-support-more-System.map-and-config-fil.patch b/main/alpine-conf/0001-update-kernel-support-more-System.map-and-config-fil.patch deleted file mode 100644 index f3c1df1f931..00000000000 --- a/main/alpine-conf/0001-update-kernel-support-more-System.map-and-config-fil.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 575a5bb38ad82ae636131c7330aed73ded8e0e4b Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 21 Dec 2023 10:59:18 +0100 -Subject: [PATCH] update-kernel: support more System.map and config-* files - -Also support Sytem.map and config with kernel release suffix. ---- - tests/bin/apk | 2 +- - update-kernel.in | 9 ++++----- - 2 files changed, 5 insertions(+), 6 deletions(-) - -diff --git a/tests/bin/apk b/tests/bin/apk -index 9868230..aaed957 100755 ---- a/tests/bin/apk -+++ b/tests/bin/apk -@@ -85,7 +85,7 @@ for pkg in $pkgs; do - flavor=${pkg#linux-} - mkdir -p "$rootfs"/lib/modules/$kver-$flavor/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac \ - "$rootfs"/boot -- touch "$rootfs"/boot/System.map-$flavor \ -+ touch "$rootfs"/boot/System.map-$kver-$flavor \ - "$rootfs"/boot/config-$flavor \ - "$rootfs"/boot/vmlinuz-$flavor - cat >"$rootfs/lib/modules/$kver-$flavor"/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko <<-EOF -diff --git a/update-kernel.in b/update-kernel.in -index ae4ed0f..cb300a1 100644 ---- a/update-kernel.in -+++ b/update-kernel.in -@@ -351,11 +351,10 @@ $MOCK mkinitfs $MKINITFS_ARGS -q -b $ROOTFS -F "$features base squashfs" \ - -o "$STAGING/initramfs-$FLAVOR" "$KVER" - - for file in System.map config vmlinuz; do -- if [ -f "$BOOT/$file-$FLAVOR" ]; then -- cp "$BOOT/$file-$FLAVOR" $STAGING -- else -- cp "$BOOT/$file" $STAGING -- fi -+ cp "$BOOT/$file-$KVER" "$STAGING" 2>/dev/null \ -+ || cp "$BOOT/$file-$FLAVOR" "$STAGING" 2>/dev/null \ -+ || cp "$BOOT/$file" "$STAGING" 2>/dev/null \ -+ || { echo "Failed to copy $file-$KVER, $file-$FLAVOR or $file" >&2; exit 1; } - done - - if [ "$MNTDIR" ]; then --- -2.43.0 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index aa7cadc5719..4a7339a1f9e 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=3.17.0 -pkgrel=1 +pkgver=3.17.1 +pkgrel=0 pkgdesc="Alpine configuration management scripts" url="https://git.alpinelinux.org/alpine-conf/about" arch="all" @@ -9,7 +9,6 @@ license="MIT" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" checkdepends="kyua" source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz - 0001-update-kernel-support-more-System.map-and-config-fil.patch " build() { @@ -28,6 +27,5 @@ check() { } sha512sums=" -22e67984e21606c3ba8eb67cb8b0aad4d09f9996d5e8504e2d69fdac66fe5e348b2bacce3290378f588cc3d835cb2d22b55cef40f3552cc1735c1e242b88f8e1 alpine-conf-3.17.0.tar.gz -7f3e0853461733b7054babdead597cbe2c00ce28a3e2d77a7380fa657009bc05ea5eb5637054bbf3f33e5f8315f95227173ad0999c90b3bb621511e3c9a77a53 0001-update-kernel-support-more-System.map-and-config-fil.patch +69651480974847912c113b4d14b6949d19636fca23cc4ae8659db5396adcb1f2e567f97e04f7b2084ba7bc1c693e5055231df20ebe6ea8b38940db2ffdd4cb90 alpine-conf-3.17.1.tar.gz " |