diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-01-26 15:05:02 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-01-26 15:05:02 +0200 |
| commit | 63a3fbcfde479d18bcce3ccccbbab54fd1252591 (patch) | |
| tree | 1ea41504151a247db105fe26406d48682ea31afa | |
| parent | 33da382fec1edeaad5764f68a1c4942f848a7481 (diff) | |
| download | alpine-conf-63a3fbcfde479d18bcce3ccccbbab54fd1252591.tar.bz2 alpine-conf-63a3fbcfde479d18bcce3ccccbbab54fd1252591.tar.xz | |
update-kernel: option for overriding architecture
| -rw-r--r-- | update-kernel.in | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/update-kernel.in b/update-kernel.in index 5f477b5..8086f5c 100644 --- a/update-kernel.in +++ b/update-kernel.in @@ -15,6 +15,7 @@ VIRTUAL=.tmp-$SCRIPT SUPERUSER= [ $(id -u) -eq 0 ] && SUPERUSER=Y +ARCH= BUILDDIR= FLAVOR= MNTDIR= @@ -30,13 +31,15 @@ error() { usage() { [ "$2" ] && error "$2" local opts="[-F <feature>]... [-p <package>]..." + local dest_args="[-a <arch>] <dest_dir>" cat >&2 <<EOF -Syntax: $SCRIPT $opts [<dest_dir>] - $SCRIPT -f <flavor> $opts <dest_dir> - $SCRIPT -b <build_dir> $opts [<dest_dir>] +Syntax: $SCRIPT $opts [$dest_args] + $SCRIPT -f <flavor> $opts $dest_args + $SCRIPT -b <build_dir> $opts [$dest_args] -Options: -b|--build <build_dir> Install custom-built kernel +Options: -a|--arch <arch> Install kernel for specified architecture + -b|--build <build_dir> Install custom-built kernel -f|--flavor <flavor> Install kernel of specified flavor -F|--feature <feature> Enable initfs feature -p|--package <package> Additional module or firmware package @@ -47,30 +50,34 @@ EOF } QUIET_OPT="--quiet" -OPTS=$(getopt -l build-dir:,flavor:,feature:,help,package:,verbose -n $SCRIPT \ - -o b:f:F:hp:v -- "$@") || usage 1 +OPTS=$(getopt -l arch:,build-dir:,flavor:,feature:,help,package:,verbose \ + -n $SCRIPT -o a:b:f:F:hp:v -- "$@") || usage 1 eval set -- "$OPTS" while :; do case "$1" in + -a|--arch) + shift + ARCH=$1 + ;; -b|--build-dir) - BUILDDIR=$2 shift + BUILDDIR=$1 ;; -f|--flavor) - FLAVOR=$2 shift + FLAVOR=$1 ;; -F|--feature) - features="$features $2" shift + features="$features $1" ;; -h|--help) echo "$SCRIPT @VERSION@" >&2 usage 0 ;; -p|--package) - PACKAGES="$PACKAGES $2" shift + PACKAGES="$PACKAGES $1" ;; -v|--verbose) QUIET_OPT= @@ -89,6 +96,9 @@ DESTDIR=$2 usage 1 "Cannot specify both build directory and flavor" if [ -z "$DESTDIR" ]; then + [ "$ARCH" ] && \ + usage 1 "Cannot specify architecture when updating the current kernel" + [ "$FLAVOR" ] && \ usage 1 "Cannot specify flavor when updating the current kernel" @@ -166,7 +176,8 @@ _apk() { wrapper="fakeroot $opt -s $fake_env --" fi - $wrapper apk $cmd $QUIET_OPT -p $ROOT --keys-dir /etc/apk/keys \ + $wrapper apk $cmd $QUIET_OPT -p $ROOT ${ARCH:+--arch "$ARCH"} \ + --keys-dir /etc/apk/keys \ --repositories-file /etc/apk/repositories $* } |