Commit e50cf02b authored by Natanael Copa's avatar Natanael Copa
Browse files

main/alpine-conf: upgrade to 3.5.0_rc1

parent 7e1d57d1
From a41ef9ab9680ec37588620f38667be22b07c0994 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Sep 2016 20:32:29 +0200
Subject: [PATCH] setup-apkrepos: dont reset http_proxy
it is likely needed if it is set.
ref #6219
---
setup-apkrepos.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/setup-apkrepos.in b/setup-apkrepos.in
index 136dcf8..5a109a2 100644
--- a/setup-apkrepos.in
+++ b/setup-apkrepos.in
@@ -44,7 +44,6 @@ time_cmd() {
}
find_fastest_mirror() {
- export http_proxy=
local url=
local arch=$(apk --print-arch)
for url in $MIRRORS; do
--
2.10.0
From 010bc7742962b4d5530ea65bff64f2e03db8639e Mon Sep 17 00:00:00 2001
From: ScrumpyJack <scrumpyjack@st.ilet.to>
Date: Wed, 22 Jun 2016 09:26:32 +0000
Subject: [PATCH 1/6] update-kernel: fix rpi missing overlays
Fixes the Linux raspberry pi dtoverlays not being copied into the
update-kernel destination directory.
---
update-kernel.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/update-kernel.in b/update-kernel.in
index 248c3d1..34a193d 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -240,7 +240,7 @@ if [ "$ARM" ]; then
DTBDIR=$ROOT/usr/lib/linux-$KVER
[ "$BUILDDIR" ] && DTBDIR=$BUILDDIR/source/arch/arm/boot/dts
cp -a "$DTBDIR"/* $DTB_STAGING
- find "$DTB_STAGING" -type f \! -name "*.dtb" -delete
+ find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo"\) -delete
fi
--
2.9.3
From 37f3d5249c16a9166ff1c63ba031c6d4c9b86183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sat, 9 Jul 2016 11:44:16 +0300
Subject: [PATCH 2/6] update-kernel: fix "find: unpaired '('"
fixes #5883
---
update-kernel.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/update-kernel.in b/update-kernel.in
index 34a193d..5b8f6f3 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -240,7 +240,7 @@ if [ "$ARM" ]; then
DTBDIR=$ROOT/usr/lib/linux-$KVER
[ "$BUILDDIR" ] && DTBDIR=$BUILDDIR/source/arch/arm/boot/dts
cp -a "$DTBDIR"/* $DTB_STAGING
- find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo"\) -delete
+ find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo" \) -delete
fi
--
2.9.3
From 824237dd105fd91bf3bdbe860c8a1908f30937d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 14 Jul 2016 06:12:30 +0000
Subject: [PATCH 3/6] update-kernel: improve dtb handling
- install dtbs to right place from kernel source trees
- install rpi dtbs to root of boot media (fixes #5884)
- support aarch64
---
update-kernel.in | 38 +++++++++++++++++++++++---------------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/update-kernel.in b/update-kernel.in
index 5b8f6f3..57f51de 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -153,7 +153,6 @@ if [ -z "$FLAVOR" ]; then
fi
[ "$ARCH" ] || ARCH=$(apk --print-arch)
-ARM=$(echo "$ARCH" | grep ^arm || :)
TMPDIR=$(mktemp -d /tmp/$SCRIPT.XXXXXX)
ROOT=$TMPDIR/root
@@ -195,9 +194,17 @@ extra_pkgs() {
_apk add --initdb --update-cache
if [ "$BUILDDIR" ]; then
+ local _install
+ case "$ARCH" in
+ arm*|aarch64*) _install="zinstall dtbs_install" ;;
+ *) _install="install" ;;
+ esac
+
mkdir -p $BOOT
- make -C "$BUILDDIR" ${ARM:+z}install firmware_install modules_install \
- INSTALL_MOD_PATH=$ROOT INSTALL_PATH=$BOOT
+ make -C "$BUILDDIR" $_install firmware_install modules_install \
+ INSTALL_MOD_PATH=$ROOT \
+ INSTALL_PATH=$BOOT \
+ INSTALL_DTBS_PATH='$ROOT/usr/lib/linux-$(KERNELRELEASE)' \
else
if [ -z "$PACKAGES" ]; then
PACKAGES="$(extra_pkgs "dahdi-linux-$FLAVOR" dahdi-linux)
@@ -211,6 +218,7 @@ _apk add --no-scripts alpine-base $PACKAGES
KVER_FLAVOR=
[ "$FLAVOR" = vanilla ] || KVER_FLAVOR=-$FLAVOR
KVER=$(basename $(ls -d $ROOT/lib/modules/*"$KVER_FLAVOR"))
+DTBDIR=$ROOT/usr/lib/linux-$KVER
depmod -b $ROOT "$KVER"
@@ -236,14 +244,6 @@ for file in System.map config vmlinuz; do
cp "$BOOT/$file$KVER_FLAVOR" $STAGING
done
-if [ "$ARM" ]; then
- DTBDIR=$ROOT/usr/lib/linux-$KVER
- [ "$BUILDDIR" ] && DTBDIR=$BUILDDIR/source/arch/arm/boot/dts
- cp -a "$DTBDIR"/* $DTB_STAGING
- find "$DTB_STAGING" -type f \! \( -name "*.dtb" -o -name "*.dtbo" \) -delete
-fi
-
-
if [ "$MNTDIR" ]; then
ignore_sigs
umount /.modloop
@@ -252,10 +252,18 @@ fi
mv $STAGING/* "$DESTDIR"
-if [ "$ARM" ]; then
- DTBDIR=$DESTDIR/dtbs
- mkdir -p "$DTBDIR"
- mv $DTB_STAGING/* "$DTBDIR"
+if [ -d "$DTBDIR" ]; then
+ local _opwd=$PWD
+ local _dtb
+ case "$FLAVOR" in
+ rpi*) _dtb="$DESTDIR" ;;
+ *) _dtb="$DESTDIR/dtbs" ;;
+ esac
+ mkdir -p "$_dtb"
+ _dtb=$(realpath "$_dtb")
+ cd "$DTBDIR"
+ find -type f \( -name "*.dtb" -o -name "*.dtbo" \) | cpio -pudm "$_dtb" 2> /dev/null
+ cd "$_opwd"
fi
if [ "$MNTDIR" ]; then
--
2.9.3
From 7ac843e901888dfc3d971815c13c9fbc12ef6405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 14 Jul 2016 06:42:13 +0000
Subject: [PATCH 4/6] update-kernel: new options --hostkeys and
--repositories-file
to simplify creation of bootable images from external repositries
and with developer signing keys.
---
update-kernel.in | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/update-kernel.in b/update-kernel.in
index 57f51de..06b7eac 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -20,6 +20,8 @@ BUILDDIR=
FLAVOR=
MNTDIR=
PACKAGES=
+MKINITFS_ARGS=
+REPOSITORIES_FILE=/etc/apk/repositories
SIGNALS="HUP INT TERM"
TMPDIR=
features=
@@ -44,14 +46,16 @@ Options: -a|--arch <arch> Install kernel for specified architecture
-F|--feature <feature> Enable initfs feature
-p|--package <package> Additional module or firmware package
-v|--verbose Verbose output
+ -K|--hostkeys Include host keys in initramfs
+ --repositories-file <f> apk repositories file
EOF
exit $1
}
QUIET_OPT="--quiet"
-OPTS=$(getopt -l arch:,build-dir:,flavor:,feature:,help,package:,verbose \
- -n $SCRIPT -o a:b:f:F:hp:v -- "$@") || usage 1
+OPTS=$(getopt -l arch:,build-dir:,flavor:,feature:,help,package:,verbose,hostkeys,repositories-file: \
+ -n $SCRIPT -o a:b:f:F:hp:vK -- "$@") || usage 1
eval set -- "$OPTS"
while :; do
case "$1" in
@@ -82,6 +86,13 @@ while :; do
-v|--verbose)
QUIET_OPT=
;;
+ -K|--hostkeys)
+ MKINITFS_ARGS="$MKINITFS_ARGS -K"
+ ;;
+ --repositories-file)
+ shift
+ REPOSITORIES_FILE=$1
+ ;;
--)
break
;;
@@ -180,7 +191,7 @@ _apk() {
$wrapper apk $cmd $QUIET_OPT -p $ROOT --arch "$ARCH" \
--keys-dir /etc/apk/keys \
- --repositories-file /etc/apk/repositories $*
+ --repositories-file "$REPOSITORIES_FILE" $*
}
extra_pkgs() {
@@ -237,7 +248,7 @@ find $ROOT/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -
done
_exec mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz
-_exec mkinitfs -q -b $ROOT -F "$features base squashfs" \
+_exec mkinitfs $MKINITFS_ARGS -q -b $ROOT -F "$features base squashfs" \
-o "$STAGING/initramfs-$FLAVOR" "$KVER"
for file in System.map config vmlinuz; do
--
2.9.3
From 0b7b6a100b22f704e1c8aedcd4d53bbf167a751e Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Fri, 5 Aug 2016 16:53:21 +0000
Subject: [PATCH 5/6] 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.3
From 78d392b36076dccf1035f0b90e5dbdb2000433a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Tue, 9 Aug 2016 13:17:25 +0300
Subject: [PATCH 6/6] update-kernel: don't use local in non-function scope
---
update-kernel.in | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/update-kernel.in b/update-kernel.in
index ab7c528..fc0899d 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -205,7 +205,6 @@ extra_pkgs() {
_apk add --initdb --update-cache
if [ "$BUILDDIR" ]; then
- local _install
case "$ARCH" in
arm*|aarch64*) _install="zinstall dtbs_install" ;;
*) _install="install" ;;
@@ -264,8 +263,7 @@ fi
mv $STAGING/* "$DESTDIR"
if [ -d "$DTBDIR" ]; then
- local _opwd=$PWD
- local _dtb
+ _opwd=$PWD
case "$FLAVOR" in
rpi*) _dtb="$DESTDIR" ;;
*) _dtb="$DESTDIR/dtbs" ;;
--
2.9.3
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.4.1
pkgrel=5
pkgver=3.5.0_rc1
pkgrel=0
pkgdesc="Alpine configuration management scripts"
url=http://git.alpinelinux.org/cgit/$pkgname
arch="all"
license="MIT"
depends="openrc>0.13"
source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
0001-update-kernel-fix-rpi-missing-overlays.patch
0002-update-kernel-fix-find-unpaired.patch
0003-update-kernel-improve-dtb-handling.patch
0004-update-kernel-new-options-hostkeys-and-repositories-.patch
0005-update-kernel-fix-bad-typo.patch
0006-update-kernel-don-t-use-local-in-non-function-scope.patch
0001-setup-apkrepos-dont-reset-http_proxy.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
......@@ -31,27 +24,6 @@ package() {
done
}
md5sums="c599b27ef9754e61cbd6726b9239fa59 alpine-conf-3.4.1.tar.xz
e275dfc8f32aa0369bc6f0f3f244b2f2 0001-update-kernel-fix-rpi-missing-overlays.patch
f81a04a5a485af48f86c8ef5d6f90e4e 0002-update-kernel-fix-find-unpaired.patch
90583a6d73a6ea87f154dd185f41e342 0003-update-kernel-improve-dtb-handling.patch
2e59f13898466248c883bf22251b40c8 0004-update-kernel-new-options-hostkeys-and-repositories-.patch
89cbbf3c2547c6872e0d7a66b587d12e 0005-update-kernel-fix-bad-typo.patch
87000d49a605a2be278334e76327699f 0006-update-kernel-don-t-use-local-in-non-function-scope.patch
f11f475130413e874f0f2589e38100c6 0001-setup-apkrepos-dont-reset-http_proxy.patch"
sha256sums="92c5cbb8078c2ee8ed9e9e749acb40f6cd69a3fbb5e49429abeff2282228f697 alpine-conf-3.4.1.tar.xz
50e9657d45d223abb323d71a00960e502f3fa75ace504ea7460b06ce9b8c1022 0001-update-kernel-fix-rpi-missing-overlays.patch
5df2436b9989797200a488a482a69db25052677b02090213a8db1ed6a2cfb1dd 0002-update-kernel-fix-find-unpaired.patch
b1254df25cd50fb9018018f91969636fd0e05cc42fe8e6432c6e0f50b40a932e 0003-update-kernel-improve-dtb-handling.patch
4a07ccc8ba58faa5a82f33b644c6f572c73467eae8fc388a617b76657c026bf9 0004-update-kernel-new-options-hostkeys-and-repositories-.patch
c3121d70ca93950a72d8793bd35c580f432cab8b1c4513974f64c8a6807bcf73 0005-update-kernel-fix-bad-typo.patch
38953da68a928002bd532fb0b46d945b0d1494b7fa12b89686fe0e9a9def0cf8 0006-update-kernel-don-t-use-local-in-non-function-scope.patch
9c26545470dc1578f99b39de9d481f96ee7d54b232f819d98da16c9ee0ce1aa3 0001-setup-apkrepos-dont-reset-http_proxy.patch"
sha512sums="eda1640e146727edf35713039143f6db4bb485ad34236f21a837f80f09bc27b38cae3e854310eb3a4d8b937766f3e8aab0cf887849bbf385f7f511d24e19cb30 alpine-conf-3.4.1.tar.xz
be3164c3b85194040820ca6ad7f1f44749dd188d3852401c1090a452cd9ce8eadcc1a8c12aad6d480565f93a4313df7f6de96b297046a3017754d812c0bb339b 0001-update-kernel-fix-rpi-missing-overlays.patch
e8ce37849ae3e9473c4ad234ab186f332b3514f05b70fb32c08ca95ffc3b44d959c48e8920acda5f735a01bfb1c0523a04d6668ef27755096f485412c2a7ff5f 0002-update-kernel-fix-find-unpaired.patch
5f7396e43fcc21809bac8c232d84bf827aaf1a925c83ceae2e73f68c822466bfc6cbe332f129996d887e115a7ff9d6f5067441dfe01dccb02dbfc9eeb16a5b9e 0003-update-kernel-improve-dtb-handling.patch
77833b9b8d6b278cd89bff4de0e05474d3191917e330e51fe6baa03bb682b853417bb92307bf66f8f9ba8c726fbe6d6e7ec816e2e3dda354bcc2c3531ccf8b66 0004-update-kernel-new-options-hostkeys-and-repositories-.patch
a256633bbadae595288fe4c9b26bfb71ae5f085a21ba1dbdd449a272ab1fdd50d44dd2dfe451c5d3e9fe0ceb1acd5c2bb3949edd0f51749b13b0890a5298c8b9 0005-update-kernel-fix-bad-typo.patch
3c0854466e7994bcde959c9e5880241d87d78aa27a8a787eab7290311fccaee230c1480c77991dcf99a252c328ae6db2286d1d7f22c7c3042b9a8d79ff730be7 0006-update-kernel-don-t-use-local-in-non-function-scope.patch
c4375cb531d5bc5d6bf0fa8d0eda5e4f996c6ebacc71398bc523e7463e9437aeba237d9c99f3038a4cb6f84e070f77725b0e672d800c03dd93821ad31100d408 0001-setup-apkrepos-dont-reset-http_proxy.patch"
md5sums="41e9c47129275bee279170afa7c25925 alpine-conf-3.5.0_rc1.tar.xz"
sha256sums="d93733e2dd630fc5627ec1eb71a71f633bcda7c75f3b65593542dc0a756bd580 alpine-conf-3.5.0_rc1.tar.xz"
sha512sums="9b77085ba719bdcfc9f9b186636f1724528270eed29e8e266fa947c91e4ee86e6253405c73b59a7977763da6e85089b57a80fd09457120a8394f5d1c786bf29b alpine-conf-3.5.0_rc1.tar.xz"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment