diff --git a/package/rene/pkgconfig/parse-config b/package/rene/pkgconfig/parse-config new file mode 100644 index 000000000..4fd743805 --- /dev/null +++ b/package/rene/pkgconfig/parse-config @@ -0,0 +1,8 @@ + +# Move the /pkgconfig/ files to :dev packages +# (won't be used if splitdesc_dev is not defined) +splitreg 42 dev '/pkgconfig/' + +# Never assume a dependency just because of reading a .pc file +var_append flistrfilter "|" '.*/pkgconfig/.*\.pc' + diff --git a/package/x11/xfree86/xfree86.conf b/package/x11/xfree86/xfree86.conf index e90a0e33b..cb797a43c 100644 --- a/package/x11/xfree86/xfree86.conf +++ b/package/x11/xfree86/xfree86.conf @@ -86,5 +86,5 @@ else fi # don't put the modules in a :dev package -splitreg 45 . '(/lib/modules/.*\.a)$|/include/' +splitreg 45 . '/lib/modules/' diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index 4e546edd4..52a9c5804 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -459,16 +459,19 @@ fi # flistroot="bin boot etc lib sbin usr var opt" -flistrfilter="ldconfig\..*: .*|.*: /var/adm/.*|.*/pkgconfig/.*\.pc" +flistrfilter="ldconfig\..*: .*|.*: /var/adm/.*" flistdel="etc/ld.so.cache|var/tmp/.*|usr/tmp/.*|var/adm/logs/.*|.*\\.old" pkgsplits="" if [ "$ROCKCFG_SPLIT_DEV" != 0 ]; then - splitreg 40 dev '(/lib/.*\.a)$|/include/' + # this doesn't affect files in /lib, just /.../lib + # so there mustn't be an exception for linux kernel modules + splitreg 40 dev '(/lib/.*\.(la|a|o)$|/include/)' splitdesc_dev() { desc_I="$desc_I (development files)"; } fi if [ "$ROCKCFG_SPLIT_DOC" != 0 ]; then - splitreg 60 doc '/share/(doc|man|info)/' + # only move doc/ to :doc, not man and info pages + splitreg 60 doc '/share/doc/' splitdesc_doc() { desc_I="$desc_I (documentation)"; } fi @@ -1064,6 +1067,8 @@ EOT [ $found_errors != 0 ] && abort fi + echo "Finished building $pkg=$xpkg." + } 2>&1 | { trap '' INT diff --git a/scripts/functions b/scripts/functions index 6f289cee9..d241203d7 100644 --- a/scripts/functions +++ b/scripts/functions @@ -90,7 +90,7 @@ splitreg() { splitapply() { local p n r sed -i "s/^[^ ]+/$1:/" $2 - while read p n r; do + while read -r p n r; do if [ "$n" = "." ]; then echo "Applying package split: $p $1 $r" sed -ri "\,$r, s/^[^ ]+/$1:/" $2