aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/alpine-conf/0001-update-kernel-remove-nopad.patch28
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 32 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-update-kernel-remove-nopad.patch b/main/alpine-conf/0001-update-kernel-remove-nopad.patch
new file mode 100644
index 0000000000..36cece148f
--- /dev/null
+++ b/main/alpine-conf/0001-update-kernel-remove-nopad.patch
@@ -0,0 +1,28 @@
+From 8beb8f42f4bd33227f7a57193631d5d3a951a8de Mon Sep 17 00:00:00 2001
+From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca>
+Date: Sat, 9 Jan 2021 12:10:56 -0500
+Subject: [PATCH] update-kernel: remove nopad
+
+-nopad squashfs files cannot be mounted by Linux kernel.
+
+Fixes: 30e6933e71fc ("update-kernel: use -nopad -Xbcj for modloop")
+---
+ update-kernel.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index d0b67e8..143e8ec 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -323,7 +323,7 @@ case $ARCH in
+ x86|x86_64) mksfs="-Xbcj x86" ;;
+ *) mksfs=
+ esac
+-mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error -nopad $mksfs
++mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error $mksfs
+
+ if [ -n "$MODLOOPSIGN" ]; then
+ sign_modloop "$STAGING/$MODIMG"
+--
+2.30.0
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 283f13964c..57fd8e1647 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.11.0
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
arch="all"
@@ -9,6 +9,7 @@ license="MIT"
depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz
0001-update-kernel-use-nopad-Xbcj-for-modloop.patch
+ 0001-update-kernel-remove-nopad.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -26,4 +27,5 @@ package() {
}
sha512sums="589278b8c4b4e87a670edda11292e93b27e21f0471749ee2e788bf620e6e957249ea1d80f44fed2600a6ed8d7943179dc2e21cd55ddcfbd8913359d0f590eb05 alpine-conf-3.11.0.tar.gz
-00ad34bdce80c716396c613b25346e23c7747b9084de0f88c2a099e5829f612b15e0a5584d139c66947907c8fbee88359979a4bea292ab5b96db4d6c2796d455 0001-update-kernel-use-nopad-Xbcj-for-modloop.patch"
+00ad34bdce80c716396c613b25346e23c7747b9084de0f88c2a099e5829f612b15e0a5584d139c66947907c8fbee88359979a4bea292ab5b96db4d6c2796d455 0001-update-kernel-use-nopad-Xbcj-for-modloop.patch
+c40169cc063235e09a8e3d03670e6ad19a941c58939dd9ecff6aad1781dfc7be3e19d6f23861c854dc1434282275325933eaff8bcdc54c5b08fcd53a1f4ea52b 0001-update-kernel-remove-nopad.patch"