janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make, scripts: Add .pc to rpm packages

Browse source 
Next attempt on creating rpm with .pc file inside.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-01-23 12:20:05 +00:00
commit 7aa477dcde
3 changed files with 5 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/create-mkspec.sh
View file

@ -65,10 +65,7 @@ _cat << EOT
|echo "mkdir -p \`dirname \$INSTALL_LOG\`"
|echo "> \$INSTALL_LOG"
|echo "make install"
|echo "cat \$INSTALL_LOG | sed \"s% \\\$RPM_BUILD_ROOT% %\" | "
|echo " grep -ve '/include/\|devel\|/lib.*\.a\$\|/make\(/\|$\)' | sort -u > \$INSTALL_LOG.\$NAME-run"
|echo "cat \$INSTALL_LOG | sed \"s% \\\$RPM_BUILD_ROOT% %\" | "
|echo " grep -e '/include/\|devel\|/lib.*\.a\$\|/make\(/\|$\)' | sort -u > \$INSTALL_LOG.\$NAME-devel"
|echo "/bin/bash ./devutil/scripts/pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
|echo ""
EOT
ini_value global.subpackages | grep -q run && _cat << EOT

7
scripts/pkg.sh
View file

@ -755,6 +755,7 @@ cmd_milk_install_log()
milk_install_log_usage()
{
echo "usage: $myname [-h] [-n pkg-name] [-t rpm|deb] [-p remove-prefix] install-log output-dir"
[ "$1" ] && exit $1
}
milk_install_log_spec_attr()
@ -799,13 +800,13 @@ cmd_milk_install_log()
in=$1
out=$2
local filter_devel='/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$\|.*\.exp$\|.*\.def$\|.*\.lib$\|\.pc$'
local filter_devel='/include/.*.h$\|devel\|make\|lib.*\.a$\|lib.*\.so$\|.*\.exp$\|.*\.def$\|.*\.lib$\|.*\.pc$'
# TODO: simplify this
case $type in
rpm)
cat $in | sed "s% $prefix% %//" | grep -ve $filter_devel > $out/files-$name-run
cat $in | sed "s% $prefix% %//" | grep -e $filter_devel > $out/files-$name-devel
cat $in | sed "s% $prefix% %" | grep -ve $filter_devel > $in.$name-run
cat $in | sed "s% $prefix% %" | grep -e $filter_devel > $in.$name-devel
;;
deb)
cat $in | grep -v "%dir" | sed "s% $prefix% %; s%//*%/%g; s/.*) *//" | grep -ve $filter_devel | sed 's/\(.*\)\/\([^/]\+\) *$/inst-root\1\/\2 \1/' > $out/$name-run.install