teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbps-src: update pkg metadata files.plist "links" array with a new object "target".

Browse Source 
The "target" object should point to the target file for the symlink. Will be
used by an upcoming xbps utils version.
This commit is contained in:
Juan RP 2011-05-31 16:39:02 +02:00
parent 4ca18691b0
commit 1bcd94905c
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xbps-src/shutils/init_funcs.sh.in
View File

@ -36,7 +36,11 @@ set_defvars()
: ${XBPS_META_PATH:=$XBPS_DBDIR/}
: ${XBPS_PKGMETADIR:=$XBPS_DBDIR/metadata}
: ${XBPS_SRCPKGDIR:=$XBPS_DISTRIBUTIONDIR/srcpkgs}
: ${XBPS_DESTDIR:=$XBPS_MASTERDIR/pkg-destdir}
if [ -n "$in_chroot" ]; then
: ${XBPS_DESTDIR:=/pkg-destdir}
else
: ${XBPS_DESTDIR:=$XBPS_MASTERDIR/pkg-destdir}
fi
: ${XBPS_PACKAGESDIR:=$XBPS_MASTERDIR/pkg-binpkgs}
: ${XBPS_BUILDDIR:=$XBPS_MASTERDIR/pkg-builddir}
: ${XBPS_SRCDISTDIR:=$XBPS_MASTERDIR/pkg-srcdistdir}

33
xbps-src/shutils/metadata.sh
View File

@ -23,19 +23,6 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#-
write_metadata_flist_header()
{
[ ! -f "$1" ] && return 1
cat > $1 <<_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">
<plist version="1.0">
<dict>
_EOF
}
xbps_write_metadata_pkg()
{
local subpkg spkgrev
@ -110,10 +97,6 @@ xbps_write_metadata_pkg_real()
lver="${version}"
fi
# Write the files.plist file.
TMPFLIST=$(mktemp -t flist.XXXXXXXXXX) || exit 1
TMPFPLIST=$(mktemp -t fplist.XXXXXXXXXX) || exit 1
#
# Find out if this package contains info files and compress
# all them with gzip.
@ -182,11 +165,18 @@ xbps_write_metadata_pkg_real()
done
fi
cd ${DESTDIR}
# Write the files.plist file.
TMPFLIST=$(mktemp -t flist.XXXXXXXXXX) || exit 1
TMPFPLIST=$(mktemp -t fplist.XXXXXXXXXX) || exit 1
msg_normal "'$pkgname-$lver': creating package metadata...\n"
write_metadata_flist_header $TMPFPLIST
cat > "$TMPFPLIST" <<_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">
<plist version="1.0">
<dict>
_EOF
# Pass 1: add links.
echo "<key>links</key>" >> $TMPFPLIST
echo "<array>" >> $TMPFPLIST
@ -198,6 +188,9 @@ xbps_write_metadata_pkg_real()
echo "<dict>" >> $TMPFPLIST
echo "<key>file</key>" >> $TMPFPLIST
echo "<string>$j</string>" >> $TMPFPLIST
echo "<key>target</key>" >> $TMPFPLIST
echo "<string>$(readlink -f "$f"|sed -e "$fpattern")</string>" \
>> $TMPFPLIST
echo "</dict>" >> $TMPFPLIST
done
echo "</array>" >> $TMPFPLIST