From d46f303f42e836959061e399b372cbac14ed0dbe Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 8 Jan 2004 07:14:55 +0000 Subject: [PATCH] Clifford Wolf : Improved dependency analysis and flist creation which also keeps track of dependencies on directories. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2133 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../cheapskatefonts/cheapskatefonts.desc | 1 - .../bitstream-vera-fonts.desc | 1 - package/rene/gpl-fonts/gpl-fonts.desc | 1 - .../microsoft-web-core-fonts.desc | 1 - package/rene/tex-ttf/tex-ttf.desc | 1 - package/rene/tuxcursor/tuxcursor.desc | 1 - .../rene/xemacs-packages/xemacs-packages.desc | 1 - package/x11/freefonts/freefonts.desc | 1 - .../ghostscript-fonts/ghostscript-fonts.desc | 1 - scripts/Build-Pkg | 31 ++++++++++++++----- 10 files changed, 23 insertions(+), 17 deletions(-) diff --git a/package/nikolaus/cheapskatefonts/cheapskatefonts.desc b/package/nikolaus/cheapskatefonts/cheapskatefonts.desc index 4d84703d3..2370b243a 100644 --- a/package/nikolaus/cheapskatefonts/cheapskatefonts.desc +++ b/package/nikolaus/cheapskatefonts/cheapskatefonts.desc @@ -30,7 +30,6 @@ [M] Nikolaus Filus [C] extra/font -[E] add x11 [L] GPL [S] Stable diff --git a/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc b/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc index 45931917a..dbd2c0788 100644 --- a/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc +++ b/package/rene/bitstream-vera-fonts/bitstream-vera-fonts.desc @@ -32,7 +32,6 @@ [M] Rene Rebe [C] base/x11 -[E] add x11 [L] OpenSource [S] Stable diff --git a/package/rene/gpl-fonts/gpl-fonts.desc b/package/rene/gpl-fonts/gpl-fonts.desc index 97a9c6318..27b14a47d 100644 --- a/package/rene/gpl-fonts/gpl-fonts.desc +++ b/package/rene/gpl-fonts/gpl-fonts.desc @@ -32,7 +32,6 @@ [M] Rene Rebe [C] extra/multimedia -[E] add x11 [L] GPL [S] Stable diff --git a/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc b/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc index 9fa069879..f8c5d8c87 100644 --- a/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc +++ b/package/rene/microsoft-web-core-fonts/microsoft-web-core-fonts.desc @@ -49,7 +49,6 @@ [M] Rene Rebe [C] extra/multimedia -[E] add x11 [L] Free-to-use [S] Stable diff --git a/package/rene/tex-ttf/tex-ttf.desc b/package/rene/tex-ttf/tex-ttf.desc index 83454b933..75998c48a 100644 --- a/package/rene/tex-ttf/tex-ttf.desc +++ b/package/rene/tex-ttf/tex-ttf.desc @@ -37,7 +37,6 @@ [M] René Rebe [C] extra/office -[E] add x11 [L] OpenSource [S] Alpha diff --git a/package/rene/tuxcursor/tuxcursor.desc b/package/rene/tuxcursor/tuxcursor.desc index c45a86048..1dedc9d08 100644 --- a/package/rene/tuxcursor/tuxcursor.desc +++ b/package/rene/tuxcursor/tuxcursor.desc @@ -33,7 +33,6 @@ [L] OpenSource [C] extra/icon -[E] add x11 [S] Stable [L] GPL diff --git a/package/rene/xemacs-packages/xemacs-packages.desc b/package/rene/xemacs-packages/xemacs-packages.desc index 0ca305e9d..05fd45d94 100644 --- a/package/rene/xemacs-packages/xemacs-packages.desc +++ b/package/rene/xemacs-packages/xemacs-packages.desc @@ -30,7 +30,6 @@ [M] Rene Rebe [C] extra/editor extra/office -[E] add xemacs [L] Free-to-use [S] Stable diff --git a/package/x11/freefonts/freefonts.desc b/package/x11/freefonts/freefonts.desc index 7192c677a..257fb437b 100644 --- a/package/x11/freefonts/freefonts.desc +++ b/package/x11/freefonts/freefonts.desc @@ -34,7 +34,6 @@ [M] Rene Rebe [C] base/x11 -[E] add x11 [L] Free-to-use [S] Stable diff --git a/package/x11/ghostscript-fonts/ghostscript-fonts.desc b/package/x11/ghostscript-fonts/ghostscript-fonts.desc index 95d4cddef..28936ddb8 100644 --- a/package/x11/ghostscript-fonts/ghostscript-fonts.desc +++ b/package/x11/ghostscript-fonts/ghostscript-fonts.desc @@ -32,7 +32,6 @@ [U] http://www.cups.org/ghostscript.php [C] extra/printing extra/office -[E] add ghostscript [L] OpenSource [S] Stable diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 0e7d65a47..39d3ddd20 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -704,7 +704,7 @@ abort() { false fi fi - if fl_wrparse -s -r "$xroot/" < $builddir/fl_wrapper.wlog | \ + if fl_wrparse -D -s -r "$xroot/" < $builddir/fl_wrapper.wlog | \ egrep "^(${flistroot// /|})(/|$)" >> \ $builddir/flist.txt then : ; fi @@ -739,13 +739,28 @@ abort() { "$ROCKCFG_FLIST" = "strace" ] && [ $stagelevel -gt 1 ] ; then echo "Calculating package dependencies ..." - ! egrep -v "^($flistrfilter)\$" $builddir/fl_wrapper.rlog | - sort -u | fl_wrparse -s -r "$xroot/" -p '' | \ - sort -k2 var/adm/flists/* - | grep -v ' var/adm/' | awk ' - BEGIN { FS=": "; current="."; } - $2 == current && $1 != "" && $2 != "'$xpkg'" { print; } - $1 == "" { current=$2; }' \ - >> $builddir/dependencies.debug + ! egrep -v "^($flistrfilter)\$" $builddir/fl_wrapper.[rw]log | + sort -u | fl_wrparse -D -s -r "$xroot/" -p '' | \ + grep -v ' var/adm/' | awk ' + ARGIND < ARGC-1 { + if ( $1 != "'$xpkg':" ) + f[$2] = $1 " " f[$2]; + } + ARGIND == ARGC-1 { + file = $2; + while ( file != "" ) { + if ( f[file] ) { + split(f[file], a); + for (i in a) + if (! d[a[i] " " file]) { + d[a[i] " " file] = 1; + print a[i] " " file; + } + } + sub("/?[^/]*$", "", file) + } + } + ' var/adm/flists/* - >> $builddir/dependencies.debug awk 'BEGIN { FS=": "; } { print "'$xpkg': " $1; }' \ < $builddir/dependencies.debug \