moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Mega-commit removing deps in xbps-base-chroot.

Browse source 
xbps-src:
  * ALWAYS use the static bins, to avoid breakage in the chroot.
  * Remove XBPS_FETCH_CMD. Use xbps-fetch (static) now that it's
    useful to download all distfiles in xbps-base-system.
  * Use busybox in the chroot and create links in /usr/local/bin
    at creation time. This helps to remove many packages that
    had problems with host/target libs (acl, attr, libarchive, etc).

build templates:
  * Add explicit gettext and texinfo build dependencies in all
    packages that need them, because they aren't built anymore
    by xbps-base-chroot.
  * Fixed some packages using build_style=gnu_makefile, that were
    broken because pre/post_configure() is not executed for a while,
    they should use pre/post_build() instead.

--HG--
extra : convert_revision : 0eaaf4917fd824710d0895e0c984bbc236b0cdf8
This commit is contained in:
Juan RP 2009-10-30 22:14:09 +01:00
parent ab0de77616
commit 1ebe5e6b5e
54 changed files with 148 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xbps-src/shutils/metadata.sh
View file

@ -213,7 +213,7 @@ xbps_write_metadata_pkg_real()
echo "<key>file</key>" >> $TMPFPLIST
echo "<string>$j</string>" >> $TMPFPLIST
echo "<key>sha256</key>" >> $TMPFPLIST
echo "<string>$(xbps-digest.static $f)</string>" \
echo "<string>$(${XBPS_DIGEST_CMD} $f)</string>" \
>> $TMPFPLIST
echo "</dict>" >> $TMPFPLIST
done
@ -244,7 +244,7 @@ xbps_write_metadata_pkg_real()
echo "<key>file</key>" >> $TMPFPLIST
echo "<string>$f</string>" >> $TMPFPLIST
echo "<key>sha256</key>" >> $TMPFPLIST
echo "<string>$(xbps-digest.static ${i})</string>" \
echo "<string>$(${XBPS_DIGEST_CMD} ${i})</string>" \
>> $TMPFPLIST
echo "</dict>" >> $TMPFPLIST
done
@ -258,6 +258,8 @@ xbps_write_metadata_pkg_real()
# Write the props.plist file.
local TMPFPROPS=$(mktemp -t fprops.XXXXXXXXXX) || exit 1
local instsize=$(du -sk ${DESTDIR}|awk '{print $1}')
cat > $TMPFPROPS <<_EOF
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@ -270,7 +272,7 @@ xbps_write_metadata_pkg_real()
<key>architecture</key>
<string>$arch</string>
<key>installed_size</key>
<integer>$(du -sb ${DESTDIR}|awk '{print $1}')</integer>
<integer>$(($instsize * 1024))</integer>
<key>maintainer</key>
<string>$(echo $maintainer|sed -e 's|<|[|g;s|>|]|g')</string>
<key>short_desc</key>
@ -345,8 +347,8 @@ _EOF
mv -f $TMPFPLIST ${DESTDIR}/files.plist
mv -f $TMPFPROPS ${DESTDIR}/props.plist
$XBPS_REGPKGDB_CMD sanitize-plist ${DESTDIR}/files.plist
$XBPS_REGPKGDB_CMD sanitize-plist ${DESTDIR}/props.plist
$XBPS_PKGDB_CMD sanitize-plist ${DESTDIR}/files.plist
$XBPS_PKGDB_CMD sanitize-plist ${DESTDIR}/props.plist
chmod 644 ${DESTDIR}/files.plist ${DESTDIR}/props.plist
[ -f $metadir/flist ] && chmod 644 $metadir/flist