aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2016-08-05 17:00:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-08-12 15:53:41 +0200
commitee6d86335ddea763bd3757ab288181b73c2f22e7 (patch)
treefff12fc1278a9ca8259960178d283bc1e7754c87
parentd6c52bdeb78fb714ae375c2dc50e4695698f0054 (diff)
downloadaports-ee6d86335ddea763bd3757ab288181b73c2f22e7.tar.gz
aports-ee6d86335ddea763bd3757ab288181b73c2f22e7.tar.bz2
aports-ee6d86335ddea763bd3757ab288181b73c2f22e7.tar.xz
main/alpine-conf: fix bad typo
fixes #5960 (cherry picked from commit dc7fda197a3664b715eb74c816fea8496d05db6e)
-rw-r--r--main/alpine-conf/0001-update-kernel-fix-bad-typo.patch25
-rw-r--r--main/alpine-conf/APKBUILD12
2 files changed, 33 insertions, 4 deletions
diff --git a/main/alpine-conf/0001-update-kernel-fix-bad-typo.patch b/main/alpine-conf/0001-update-kernel-fix-bad-typo.patch
new file mode 100644
index 0000000000..59919cb67c
--- /dev/null
+++ b/main/alpine-conf/0001-update-kernel-fix-bad-typo.patch
@@ -0,0 +1,25 @@
+From a79092c652ce0b490ba582d682662e83db9fc7b4 Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Fri, 5 Aug 2016 16:53:21 +0000
+Subject: [PATCH] update-kernel: fix bad typo
+
+---
+ update-kernel.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/update-kernel.in b/update-kernel.in
+index 06b7eac..ab7c528 100644
+--- a/update-kernel.in
++++ b/update-kernel.in
+@@ -215,7 +215,7 @@ if [ "$BUILDDIR" ]; then
+ make -C "$BUILDDIR" $_install firmware_install modules_install \
+ INSTALL_MOD_PATH=$ROOT \
+ INSTALL_PATH=$BOOT \
+- INSTALL_DTBS_PATH='$ROOT/usr/lib/linux-$(KERNELRELEASE)' \
++ INSTALL_DTBS_PATH='$ROOT/usr/lib/linux-$(KERNELRELEASE)'
+ else
+ if [ -z "$PACKAGES" ]; then
+ PACKAGES="$(extra_pkgs "dahdi-linux-$FLAVOR" dahdi-linux)
+--
+2.9.1
+
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 1836b78dbb..ae5a348bfb 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.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
@@ -11,6 +11,7 @@ source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.x
0001-update-kernel-fix-rpi-missing-overlays.patch
0002-update-kernel-fix-find-unpaired.patch
0003-update-kernel-improve-dtb-handling.patch
+ 0001-update-kernel-fix-bad-typo.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
@@ -30,12 +31,15 @@ package() {
md5sums="c599b27ef9754e61cbd6726b9239fa59 alpine-conf-3.4.1.tar.xz
dbec0da0403ec5d224b2b4d71f6eee8b 0001-update-kernel-fix-rpi-missing-overlays.patch
9547aaf63b65fd5c3eb009e22af4750a 0002-update-kernel-fix-find-unpaired.patch
-c039d2bdab892b554c80061fb977fb27 0003-update-kernel-improve-dtb-handling.patch"
+c039d2bdab892b554c80061fb977fb27 0003-update-kernel-improve-dtb-handling.patch
+5f0b0142069305e0ddb96118dea320fd 0001-update-kernel-fix-bad-typo.patch"
sha256sums="92c5cbb8078c2ee8ed9e9e749acb40f6cd69a3fbb5e49429abeff2282228f697 alpine-conf-3.4.1.tar.xz
bb06b13c8d7712265dc7700e08023c18306bf4bb7cef8cff07e96562b48bcd48 0001-update-kernel-fix-rpi-missing-overlays.patch
e422c719021fcc8614bcea5eed7e19220ac70fe6f39af3784dc0d02fba2505b7 0002-update-kernel-fix-find-unpaired.patch
-f98578628d89a350efc83edde662530414cdf34c869897cd206115e8eb5cb005 0003-update-kernel-improve-dtb-handling.patch"
+f98578628d89a350efc83edde662530414cdf34c869897cd206115e8eb5cb005 0003-update-kernel-improve-dtb-handling.patch
+12512530215ccddb6b2922cc1d5359c0417f1d0afd3986dc58230641d09b105f 0001-update-kernel-fix-bad-typo.patch"
sha512sums="eda1640e146727edf35713039143f6db4bb485ad34236f21a837f80f09bc27b38cae3e854310eb3a4d8b937766f3e8aab0cf887849bbf385f7f511d24e19cb30 alpine-conf-3.4.1.tar.xz
9555a7a9a5ab62a7e2604a8a7f76de0a939dd1f4fc27f23abd0fd631528d17514a80be718f5a2c0286e33925991b05b30a1c1324903135128d964f1830b23d50 0001-update-kernel-fix-rpi-missing-overlays.patch
b5809e8720bbcaf89e6f336e5351d796a3ea5df4c02aac8cb0845bf4f7a3cf3a4ed70ab548f0620d38c47a57319bc1e63a131b2d8b535f7932e74f7163950536 0002-update-kernel-fix-find-unpaired.patch
-9228b13f862ac5a4085c9e0a24115e488a76ea817437f252414956b543887135c5e0da3a2cd5d96f69f5ee8cabb3eafaef693b4fe28f9e9b74fa6c0c92280b82 0003-update-kernel-improve-dtb-handling.patch"
+9228b13f862ac5a4085c9e0a24115e488a76ea817437f252414956b543887135c5e0da3a2cd5d96f69f5ee8cabb3eafaef693b4fe28f9e9b74fa6c0c92280b82 0003-update-kernel-improve-dtb-handling.patch
+a3ac1e41f25941c811302b6f2a1b7139e15b4df16b561ad3fe547fc031d5328149de41ac44c6e9cde8482d351882fbbf6393f29e824d7b68a62031125c60ca80 0001-update-kernel-fix-bad-typo.patch"