diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lbu | 22 |
2 files changed, 17 insertions, 7 deletions
@@ -1,4 +1,4 @@ -V=0.8_beta2 +V=0.8_beta3 P=alpine-conf PV=$(P)-$(V) APKF=$(PV).apk @@ -172,11 +172,19 @@ cmd_commit() { cd "$ROOT" - # for upgrading from packages.list times - mkdir -p $(dirname "$INCLUDE_LIST") - if ! grep "var/lib/apk/world" "$INCLUDE_LIST" >/dev/null 2>&1 ; then - echo "var/lib/apk/world" >> "$INCLUDE_LIST" - fi +# # for upgrading from packages.list times +# mkdir -p $(dirname "$INCLUDE_LIST") +# if ! grep "var/lib/apk/world" "$INCLUDE_LIST" >/dev/null 2>&1 ; then +# echo "var/lib/apk/world" >> "$INCLUDE_LIST" +# fi + + # generate the packages.list + echo "#This file is generated by 'lbu commit'" > /etc/lbu/packages.list + for i in $(apk_glob '*') ; do + reqby=$(apk_info -qr $i); + # only add the packages who has no REQUIRED_BY + [ -z "$reqby" ] && echo $i + done | sed 's/-[0-9].*//' >> /etc/lbu/packages.list # Automatically add list and modified files currentlist=`VERBOSE="" USE_DEFAULT="-a" cmd_status -a | grep -v ^D | awk '{print $2}'` @@ -206,7 +214,9 @@ cmd_commit() { fi # remove obsolete file - if [ -z "$DRYRUN" ] ; then + if [ -z "$DRYRUN" ] && [ -f $mnt/packages.list ]; then + echo "Note: Removing packages.list from $(basename $mnt)." + echo " /etc/lbu/packages.list will be used." rm -f $mnt/packages.list fi |