diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-19 09:15:40 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-19 09:34:26 +0000 |
| commit | ee517c9da857b5dc4f92b35dde5449b66bda420b (patch) | |
| tree | 23d422e2d4f349785e5ea9124f8eb1383d9d7e9b | |
| parent | 0c6b47193b5a4a025f6b34d111e78dba20adc8d0 (diff) | |
| download | alpine_aports-ee517c9da857b5dc4f92b35dde5449b66bda420b.tar.bz2 alpine_aports-ee517c9da857b5dc4f92b35dde5449b66bda420b.tar.xz alpine_aports-ee517c9da857b5dc4f92b35dde5449b66bda420b.zip | |
scripts/mkimg.arm.sh: fix inclusion of u-boot-pine64
fix the sed extression that filters out version number sot it does not
strip out the `-pine64` part of string.
apk fetch --simulate --root --recursive u-boot-all
| -rwxr-xr-x | scripts/mkimg.arm.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh index 6f9a31581e..a671f0543f 100755 --- a/scripts/mkimg.arm.sh +++ b/scripts/mkimg.arm.sh | |||
| @@ -96,7 +96,7 @@ profile_rpi() { | |||
| 96 | build_uboot() { | 96 | build_uboot() { |
| 97 | set -x | 97 | set -x |
| 98 | # FIXME: Fix apk-tools to extract packages directly | 98 | # FIXME: Fix apk-tools to extract packages directly |
| 99 | local pkg pkgs="$(apk fetch --simulate --root "$APKROOT" --recursive u-boot-all | sed -ne "s/^Downloading \([^0-9.]*\)\-.*$/\1/p")" | 99 | local pkg pkgs="$(apk fetch --simulate --root "$APKROOT" --recursive u-boot-all | sed -ne "s/^Downloading \(.*\)\-[0-9].*$/\1/p")" |
| 100 | for pkg in $pkgs; do | 100 | for pkg in $pkgs; do |
| 101 | [ "$pkg" = "u-boot-all" ] || apk fetch --root "$APKROOT" --stdout $pkg | tar -C "$DESTDIR" -xz usr | 101 | [ "$pkg" = "u-boot-all" ] || apk fetch --root "$APKROOT" --stdout $pkg | tar -C "$DESTDIR" -xz usr |
| 102 | done | 102 | done |