# HG changeset patch # User Christopher Rogers # Date 1309955083 0 # Node ID ba40ec6eac2b21c1f059a62e31db5b36904d4c1c # Parent 6b76b34dbe1b8a93acf1879b6de91ded491f09ce tazwok: Moved libs variable to update_lib_db function. Fixed a typo. diff -r 6b76b34dbe1b -r ba40ec6eac2b tazwok --- a/tazwok Mon May 23 20:45:06 2011 +0000 +++ b/tazwok Wed Jul 06 12:24:43 2011 +0000 @@ -1096,6 +1096,17 @@ return 1 } +update_lib_db() +{ + # Update lib_db + libs=$(for file in $(find * -type f); do + [ "$(dd if=$file bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ] || continue + LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so $PWD/$file + done | { cut -f 1 -d ' ' | tr -d '\t' | sort -u | \ + sed -e 's/^linux-gate.so.*$/SLIB/' -e 's~^/lib/ld-.*$~SLIB~' \ + -e '/^statically$/d' | tr '\n' ' '; }) +} + # Create a package tree and build the gziped cpio archive # to make a SliTaz (.tazpkg) package. gen_package() @@ -1228,14 +1239,8 @@ report end-step fi - # Update lib_db - libs=$(for file in $(find * -type f); do - [ "$(dd if=$file bs=1 skip=1 count=3 2> /dev/null)" = "ELF" ] || continue - LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so $PWD/$file - done | { cut -f 1 -d ' ' | tr -d '\t' | sort -u | \ - sed -e 's/^linux-gate.so.*$/SLIB/' -e 's~^/lib/ld-.*$~SLIB~' \ - -e '/^statically$/d' | tr '\n' ' '; }) - + update_lib_db + sed "/$PACKAGE\t/d" -i $lib_db if [ "$libs" ]; then libs=$(echo " $libs" | sed -r 's/( SLIB)+ / /g') @@ -2208,7 +2213,7 @@ fi report step "Moving incoming packages to main repository" - [ "save_wok" ] && mkdir -p $PACKAGES_REPOSITORY/wok + [ "$save_wok" ] && mkdir -p $PACKAGES_REPOSITORY/wok unset EXTRAVERSION for PACKAGE in $incoming_pkgs; do prev_VERSION=$(get_pkg_version $PACKAGES_REPOSITORY)