Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 19 years ago
parent
commit
abe476d9d8
1 changed files with 7 additions and 5 deletions
  1. +7
    -5
      scripts/Build-Pkg

+ 7
- 5
scripts/Build-Pkg

@ -484,7 +484,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/.*|var/adm/logs/.*|.*\\.old"
flistdel="etc/ld.so.cache|var/tmp/.*|var/lock/.*|var/run/.*|usr/tmp/.*|.*\\.old"
pkgsplits=""
if [ "$ROCKCFG_SPLIT_DEV" != 0 ]; then
@ -499,8 +499,10 @@ if [ "$ROCKCFG_SPLIT_DOC" != 0 ]; then
splitdesc_doc() { desc_I="$desc_I (documentation)"; }
fi
if [ "$pkg" != rock-debug ]; then
flistdel="$flistdel|var/adm/rock-debug/.*"
if [ "$pkg" != 00-dirtree -a "$pkg" != rock-debug ]; then
flistdel="$flistdel|var/adm/.*"
else
flistdel="$flistdel|var/adm/logs/.*"
fi
if [ $stagelevel -le 1 ]
@ -934,7 +936,7 @@ abort() {
fi
# evaluate flistdel (1/2)
egrep -v "^($flistdel|var/adm/.*)\$" $builddir/flist.txt | sort -u > $builddir/flist.txt.new
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
@ -959,7 +961,7 @@ abort() {
done
# evaluate flistdel (2/2)
egrep -v "^($flistdel|var/adm/.*)\$" $builddir/flist.txt | sort -u > $builddir/flist.txt.new
egrep -v "^($flistdel)\$" $builddir/flist.txt | sort -u > $builddir/flist.txt.new
mv $builddir/flist.txt.new $builddir/flist.txt
hook_eval postflist

Loading…
Cancel
Save