jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

comon/hooks: update pkg hooks to also create/register -dbg pkgs.

Browse source
This commit is contained in:
Juan RP 2014-03-02 06:30:25 +01:00
parent 0acd78cd00
commit b3200722ef
2 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/hooks/post-pkg/00-register-pkg.sh
View file

@ -1,5 +1,21 @@
# This hook registers a XBPS binary package into the specified local repository.
registerpkg() {
local repo="$1" pkg="$2"
if [ ! -f ${repo}/${pkg} ]; then
msg_error "Unexistent binary package ${repo}/${pkg}!\n"
fi
msg_normal "Registering ${pkg} into ${repo} ...\n"
if [ -n "$XBPS_CROSS_BUILD" ]; then
$XBPS_RINDEX_XCMD ${XBPS_BUILD_FORCEMODE:+-f} -a ${repo}/${pkg}
else
$XBPS_RINDEX_CMD ${XBPS_BUILD_FORCEMODE:+-f} -a ${repo}/${pkg}
fi
}
hook() {
local arch= binpkg= pkgdir=
@ -13,22 +29,19 @@ hook() {
if [ -z "$noarch" -a -n "$XBPS_ARCH" -a "$XBPS_ARCH" != "$XBPS_TARGET_MACHINE" ]; then
arch=${XBPS_ARCH}
fi
binpkg=$pkgver.$arch.xbps
if [ -n "$nonfree" ]; then
pkgdir=$XBPS_REPOSITORY/nonfree
else
pkgdir=$XBPS_REPOSITORY
fi
binpkg=${pkgver}.${arch}.xbps
binpkg_dbg=${pkgver}-dbg.${arch}.xbps
if [ ! -f ${pkgdir}/${binpkg} ]; then
msg_error "Unexistent binary package ${pkgdir}/${binpkg}!\n"
fi
# Register binpkg.
registerpkg $pkgdir $binpkg
msg_normal "Registering ${binpkg} into ${pkgdir} ...\n"
if [ -n "$XBPS_CROSS_BUILD" ]; then
$XBPS_RINDEX_XCMD ${XBPS_BUILD_FORCEMODE:+-f} -a ${pkgdir}/${binpkg}
else
$XBPS_RINDEX_CMD ${XBPS_BUILD_FORCEMODE:+-f} -a ${pkgdir}/${binpkg}
# Register -dbg binpkg if it exists.
if [ -f ${pkgdir}/${binpkg_dbg} ]; then
registerpkg ${pkgdir} ${binpkg_dbg}
fi
}

16
common/hooks/pre-pkg/00-gen-pkg.sh
View file

@ -1,6 +1,6 @@
# This hook generates a XBPS binary package from an installed package in destdir.
hook() {
genpkg() {
local binpkg= pkgdir= arch= _deps= f=
if [ ! -d "${PKGDESTDIR}" ]; then
@ -124,3 +124,17 @@ hook() {
msg_normal "Created binary package successfully: ${binpkg}\n"
}
hook() {
genpkg
# Generate -dbg pkg.
if [ -d "$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${pkgname}-dbg-${version}" ]; then
reset_subpkg_vars
pkgname="${pkgname}-dbg"
pkgver="${pkgname}-${version}_${revision}"
short_desc+=" (debug files)"
PKGDESTDIR="$XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/${pkgname}-${version}"
genpkg
fi
}