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

main/alpine-conf: backport dtbs fix

parent 80a42e35
From 3fd2ce439dda613a56e3d130c192040a88817787 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 18 Dec 2019 15:23:10 +0000
Subject: [PATCH] update-kernel: fix dtbs dir
---
update-kernel.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/update-kernel.in b/update-kernel.in
index 0079182..3d13d25 100644
--- a/update-kernel.in
+++ b/update-kernel.in
@@ -264,7 +264,7 @@ fi
KVER_FLAVOR=
[ "$FLAVOR" = vanilla ] || KVER_FLAVOR=-$FLAVOR
KVER=$(basename $(ls -d $ROOT/lib/modules/*"$KVER_FLAVOR"))
-DTBDIR=$ROOT/usr/lib/linux-$KVER
+DTBDIR=$ROOT/boot/dtbs-$FLAVOR
depmod -b $ROOT "$KVER"
@@ -341,8 +341,8 @@ if [ -d "$DTBDIR" ]; then
_opwd=$PWD
case "$MEDIA,$FLAVOR" in
yes,rpi*) _dtb="$DESTDIR/" ;;
- yes,*) _dtb="$DESTDIR/boot/dtbs" ;;
- *,*) _dtb="$DESTDIR/dtbs" ;;
+ yes,*) _dtb="$DESTDIR/boot/dtbs-$FLAVOR" ;;
+ *,*) _dtb="$DESTDIR/dtbs/dtbs-$FLAVOR" ;;
esac
mkdir -p "$_dtb"
_dtb=$(realpath "$_dtb")
--
2.24.1
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf
pkgver=3.8.3
pkgrel=3
pkgrel=4
pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about"
arch="all"
......@@ -11,6 +11,7 @@ source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.
0001-libalpine-use-correct-exit-code-in-trap.patch
0001-setup-disk-let-user-set-ROOT_SIZE.patch
0001-setup-apkrepos-use-cdn-as-default-answer.patch
0001-update-kernel-fix-dtbs-dir.patch
"
builddir="$srcdir"/$pkgname-$pkgver
......@@ -30,4 +31,5 @@ package() {
sha512sums="73bd999b552d266c994cc1535570b86ddd7a7379f3b9e244c4985722f5754b11323a4e677cdae91fa4f0098dadd388eba679a99d98e140354ab7681bb85f9dfa alpine-conf-3.8.3.tar.xz
b5a4ed4e1507a6dde503edca5bc71c9f26e81e3f85dd01aa3705b300d7e9b9f48b7005250dea3105bef89a688bbf70257290e921d49534f6e6dd8848bb5b2fdb 0001-libalpine-use-correct-exit-code-in-trap.patch
bf59558e5477929a0692c9ba182b71f7913533b50abd53303be6c47897348c53ec587c27a20442c180564c552f84d90d3c7d700b5f6e2cb4bb0a6ac1a7dafd1d 0001-setup-disk-let-user-set-ROOT_SIZE.patch
a11e69e18da2c86cb5a419b2fc9db144b7fef4676fb4cd7c33bfe6dbf638adb872f7dd43b5c86fba916e94bdcd2d3c352931c579ea3e3333736c1fc3e5cd22fa 0001-setup-apkrepos-use-cdn-as-default-answer.patch"
a11e69e18da2c86cb5a419b2fc9db144b7fef4676fb4cd7c33bfe6dbf638adb872f7dd43b5c86fba916e94bdcd2d3c352931c579ea3e3333736c1fc3e5cd22fa 0001-setup-apkrepos-use-cdn-as-default-answer.patch
e6d7ef82f2c875866dba6c8d18c6b8d9909c0a56081252ff1a1b0bfba2a493a3550377e20fa2975e5b6aa4e52f2607730b7ed158dd419751fad2368d9fa0ece5 0001-update-kernel-fix-dtbs-dir.patch"
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