oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: support for new style install scrits

Browse Source 
We need to list all install scripts in $install rather than specify it
in subpackage
This commit is contained in:
Natanael Copa 2011-06-27 18:55:14 +00:00
parent 42df5722ee
commit f597a6e68c
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
abuild.in
View File

@ -586,15 +586,12 @@ EOF
local metafiles=".PKGINFO" local metafiles=".PKGINFO"
for i in $install ${triggers%%:*}; do for i in $install ${triggers%%:*}; do
local n=${i%.*}
if [ "$n" != "$pkgname" ]; then
continue
fi
script=${i#$name} script=${i#$name}
case "$script" in
.pre-install|.post-install|.pre-upgrade|.post-upgrade|.pre-deinstall|.post-deinstall|.trigger)
msg "Adding $script" msg "Adding $script"
;;
*) error "$script: Invalid install/trigger script"
return 1
;;
esac
cp "$startdir/$i" "$controldir/$script" || return 1 cp "$startdir/$i" "$controldir/$script" || return 1
chmod +x "$controldir/$script" chmod +x "$controldir/$script"
metafiles="$metafiles $script" metafiles="$metafiles $script"
@ -849,7 +846,6 @@ update_abuildrepo() {
# predefined splitfunc doc # predefined splitfunc doc
default_doc() { default_doc() {
depends="$depends_doc" depends="$depends_doc"
install="$install_doc"
triggers="$triggers_doc" triggers="$triggers_doc"
pkgdesc="$pkgdesc (documentation)" pkgdesc="$pkgdesc (documentation)"
arch=${arch_doc:-"noarch"} arch=${arch_doc:-"noarch"}
@ -882,7 +878,6 @@ doc() {
# predefined splitfunc mod # predefined splitfunc mod
default_mod() { default_mod() {
depends="$kernel $depends_mod" depends="$kernel $depends_mod"
install="$install_mod"
for i in firmware modules; do for i in firmware modules; do
if [ -d "$pkgdir/lib/$i" ]; then if [ -d "$pkgdir/lib/$i" ]; then
rm -rf "$subpkgdir/lib" rm -rf "$subpkgdir/lib"
@ -900,7 +895,6 @@ mod() {
default_dev() { default_dev() {
local i= j= local i= j=
depends="$pkgname $depends_dev" depends="$pkgname $depends_dev"
install="$install_dev"
triggers="$triggers_dev" triggers="$triggers_dev"
pkgdesc="$pkgdesc (development files)" pkgdesc="$pkgdesc (development files)"
@ -1443,7 +1437,6 @@ fi
if [ -n "$subpkgname" ]; then if [ -n "$subpkgname" ]; then
origsubpackages="$subpackages" origsubpackages="$subpackages"
subpackages= subpackages=
install=
triggers= triggers=
fi fi
pkgdir="$pkgbasedir/$pkgname" pkgdir="$pkgbasedir/$pkgname"