# HG changeset patch # User Pascal Bellard # Date 1567850066 -7200 # Node ID 406c6fe80674d2f71a278fe16e33bdeac2295deb # Parent 293348721e352ada818dcb240b91a9608bc8f5cc Take care of busybox config diff -r 293348721e35 -r 406c6fe80674 helper --- a/helper Fri Sep 06 11:02:35 2019 +0200 +++ b/helper Sat Sep 07 11:54:26 2019 +0200 @@ -33,6 +33,8 @@ EOT + unlzma < $TMPDIR/pkgs/linux-[2-9]*/fs.cpio.lzma | \ + ( cd $TMPDIR/fs ; cpio -idmu boot/config-busybox ) for i in $TMPDIR/pkgs/*/receipt pkgs/*/receipt; do [ -s $i ] || continue case "$i" in @@ -51,11 +53,14 @@ grep -qs "^$PACKAGE " $TMPDIR/uploadconf && checked='checked="checked"' case "$AUTO_SELECTION" in - never) - continue;; - always) - checked='checked="checked" disabled' - hidden_var="";; + never) + continue;; + always) + checked='checked="checked" disabled' + hidden_var="";; + CONF*) + grep -qs "^$AUTO_SELECTION=y$" $TMPDIR/fs/boot/config-busybox || + checked='disabled';; esac cat < @@ -272,7 +277,7 @@ . $pkg grep -qs ^pre_install $pkg && pre_install $2/fs [ -n "$CONFIG_FILES" ] && for i in $CONFIG_FILES; do echo $i >> $2/config_files; done - unlzma -c $(dirname $pkg)/fs.cpio.lzma | ( cd $2 ; cpio -idmu ) + unlzma < $(dirname $pkg)/fs.cpio.lzma | ( cd $2 ; cpio -idmu ) exit } @@ -365,7 +370,7 @@ lzma_set_size() { - n=$(unlzma -c $1 | wc -c) + n=$(unlzma < $1 | wc -c) for i in $(seq 1 8); do printf '\\\\x%02X' $(($n & 255)) n=$(($n >> 8))