From 4fc9be7d422b1c7f121cac334a625209c993497d Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Mon, 18 Sep 2006 14:41:48 +0000 Subject: [PATCH] Stefan Fiedler & Benjamin Schieder: Combine the following patches in a clean diff: [2006080213344240580] [2006082613341813613] [2006082808102315386] [2006082808450030065] [2006083108274710810] [2006090720094428839] [2006090720095928861] [2006091816143216433] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7919 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- misc/pkgsel/sets/common.set | 2 +- misc/tools-source/config_helper.c | 2 +- package/base/00-dirtree/00-dirtree.conf | 2 ++ package/base/rock-debug/rock-debug.conf | 2 ++ package/blindcoder/libavc1394/libavc1394.desc | 4 +-- package/kasc/libsdl_ttf/libsdl_ttf.desc | 4 +-- scripts/Build-Pkg | 34 ++++++++----------- 7 files changed, 24 insertions(+), 26 deletions(-) diff --git a/misc/pkgsel/sets/common.set b/misc/pkgsel/sets/common.set index 58514d16b..b08535ec7 100644 --- a/misc/pkgsel/sets/common.set +++ b/misc/pkgsel/sets/common.set @@ -22,7 +22,7 @@ / acpid / { p; d; }; / aterm / { p; d; }; -/ bdb=bdb42 / { p; d; }; +/ bdb=bdb44 / { p; d; }; / bind / { p; d; }; / bc / { p; d; }; / dhcp / { p; d; }; diff --git a/misc/tools-source/config_helper.c b/misc/tools-source/config_helper.c index ddcef2523..f2b24af85 100644 --- a/misc/tools-source/config_helper.c +++ b/misc/tools-source/config_helper.c @@ -270,7 +270,7 @@ int pkgswitch(int mode, char **args) } pkg = (last_pkg=pkg)->next; } - + regfree(preg); return 0; } diff --git a/package/base/00-dirtree/00-dirtree.conf b/package/base/00-dirtree/00-dirtree.conf index 0beb9aa5a..1af79a56c 100644 --- a/package/base/00-dirtree/00-dirtree.conf +++ b/package/base/00-dirtree/00-dirtree.conf @@ -62,3 +62,5 @@ check_usrlocal=0 # don't split this package postflist="pkgsplits=" +var_remove flist''del "|" "var/adm/.*" +var_insert flist''del "|" "var/adm/logs/.*" diff --git a/package/base/rock-debug/rock-debug.conf b/package/base/rock-debug/rock-debug.conf index cea5b40cf..f79bcad72 100644 --- a/package/base/rock-debug/rock-debug.conf +++ b/package/base/rock-debug/rock-debug.conf @@ -57,3 +57,5 @@ custmain="main_rd" autoextract=0 srctar=none +var_remove flist''del "|" "var/adm/.*" +var_insert flist''del "|" "var/adm/logs/.*" diff --git a/package/blindcoder/libavc1394/libavc1394.desc b/package/blindcoder/libavc1394/libavc1394.desc index 79f59d1f3..e36fe394f 100644 --- a/package/blindcoder/libavc1394/libavc1394.desc +++ b/package/blindcoder/libavc1394/libavc1394.desc @@ -36,8 +36,8 @@ [L] GPL [S] Beta -[V] 0.5.0 +[V] 0.5.3 [P] X -?---5---9 131.100 -[D] 9887435 libavc1394-0.5.0.tar.gz http://dl.sourceforge.net/sourceforge/libavc1394/ +[D] 2656303995 libavc1394-0.5.3.tar.gz http://dl.sourceforge.net/sourceforge/libavc1394/ diff --git a/package/kasc/libsdl_ttf/libsdl_ttf.desc b/package/kasc/libsdl_ttf/libsdl_ttf.desc index eab0cd454..690a53fef 100644 --- a/package/kasc/libsdl_ttf/libsdl_ttf.desc +++ b/package/kasc/libsdl_ttf/libsdl_ttf.desc @@ -37,8 +37,8 @@ [L] GPL [S] Stable -[V] 2.0.7 +[V] 2.0.8 [P] X -?---5---9 146.000 -[D] 1448164667 SDL_ttf-2.0.7.tar.gz http://www.libsdl.org/projects/SDL_ttf/release/ +[D] 716343315 SDL_ttf-2.0.8.tar.gz http://www.libsdl.org/projects/SDL_ttf/release/ diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index b322b6eb7..a408cc22c 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -508,7 +508,7 @@ fi flistroot="bin boot etc lib sbin usr var opt" flistrfilter="ldconfig\..*: .*|.*: /var/adm/.*" -flistdel="etc/ld.so.cache|var/tmp/.*|var/lock/.*|var/run/.*|usr/tmp/.*|.*\\.old" +flistdel="var/adm/.*|var/tmp/.*|var/lock/.*|var/run/.*|etc/ld.so.cache|usr/tmp/.*|.*\\.old" pkgsplits="" if [ "$ROCKCFG_SPLIT_DEV" != 0 ]; then @@ -523,12 +523,6 @@ if [ "$ROCKCFG_SPLIT_DOC" != 0 ]; then splitdesc_doc() { desc_I="$desc_I (documentation)"; } fi -if [ "$pkg" != 00-dirtree -a "$pkg" != rock-debug ]; then - flistdel="$flistdel|var/adm/.*" -else - flistdel="$flistdel|var/adm/logs/.*" -fi - if [ $stagelevel -le 1 ] then makeopt='CC="$CC" CXX="$CXX" CC_FOR_BUILD="$BUILDCC"' @@ -927,40 +921,40 @@ abort() { if [ "$stagelevel" -le 1 ] then xbase="$( cd $xroot/ 2> /dev/null ; pwd -P )" - if egrep -qv "[ ]($base|$xbase|/tmp|/usr/tmp|/var/tmp|/var/backups|/proc|/dev)(/|$)" \ - "$builddir/fl_wrapper.wlog" + if egrep -qv "[ ]($base|$xbase|$builddir|/tmp|/usr/tmp|/var/tmp|/var/backups|/proc|/dev)(/|$)" \ + $builddir/fl_wrapper.wlog then x="Created file outside basedir: " - egrep -v "[ ]($base|$xbase|/tmp|/usr/tmp|/var/tmp|/proc|/dev)(/|$)" \ - "$builddir/fl_wrapper.wlog" | \ + egrep -v "[ ]($base|$xbase|$builddir|/tmp|/usr/tmp|/var/tmp|/proc|/dev)(/|$)" \ + $builddir/fl_wrapper.wlog | \ cut -f2- | sort -u | sed "s,^,$x," echo "base #1: $base" echo "base #2: $xbase" abort fi fi - if fl_wrparse -D -s -r "$xroot/" < "$builddir/fl_wrapper.wlog" | \ + if fl_wrparse -D -s -r "$xroot/" < $builddir/fl_wrapper.wlog | \ egrep "^(${flistroot// /|})(/|$)" >> \ - "$builddir/flist.txt" + $builddir/flist.txt then : ; fi elif [ "$ROCKCFG_FLIST" = "find" ] ; then if find $flistroot \ \( -not -type d -or -type d -empty \) \ - -and \( -newer "$builddir/temp.time_stamp" -or \ - -cnewer "$builddir/temp.time_stamp" \) -printf "%p\n" >> \ - "$builddir/flist.txt" + -and \( -newer $builddir/temp.time_stamp -or \ + -cnewer $builddir/temp.time_stamp \) -printf "%p\n" >> \ + $builddir/flist.txt then : ; fi fi # evaluate flistdel (1/2) - egrep -v "^($flistdel)\$" "$builddir/flist.txt" | sort -u > "$builddir/flist.txt.new" - mv "$builddir/flist.txt.new" "$builddir/flist.txt" + egrep -v "^($flistdel)\$" $builddir/flist.txt | sort -u > $builddir/flist.txt.new + mv $builddir/flist.txt.new $builddir/flist.txt # copy over missing *.a files if [ "$autoso2a" = 1 ]; then echo "Checking for missing .a files ..." while read d s; do - grep -q "/${s%.so}.a$" "$builddir/flist.txt" && continue + grep -q "/${s%.so}.a$" $builddir/flist.txt && continue [ "$d" = "lib" ] && d="usr/lib" if [ -f "$AUTOSO2A_DIR/${s%.so}.a" ]; then echo "Installing automatically created $d/${s%.so}.a." @@ -1039,7 +1033,7 @@ abort() { done # remove dependencies as requested by the package - # TODO: goups are not used yet (and it is not easy here) + # TODO: groups are not used yet (and it is not easy here) del_pattern="" for x in `echo "$desc_E" | egrep '^del ' | sed 's/^del //' ` ; do del_pattern="$del_pattern -e \".*: $x(:.*|)\$\""