emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix installation of packages in the chroot due to previous

Browse Source 
changes.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20090818175825-sazm2dea97y4m0ky
This commit is contained in:
Juan RP 2009-08-18 19:58:25 +02:00
parent 9680251382
commit c9d19c2da9
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/Makefile
View File

@ -4,6 +4,8 @@ CONF_FILE = xbps-src.conf
.PHONY: all .PHONY: all
all: all:
sed -e "s|@@XBPS_INSTALL_PREFIX@@|$(PREFIX)|g" \
$(CONF_FILE) > $(CONF_FILE).new
.PHONY: clean .PHONY: clean
clean: clean:
@ -13,6 +15,7 @@ install:
install -d $(DESTDIR)$(ETCDIR); \ install -d $(DESTDIR)$(ETCDIR); \
fi fi
if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then \ if [ ! -f $(DESTDIR)$(ETCDIR)/$(CONF_FILE) ]; then \
install -m 644 $(CONF_FILE) $(DESTDIR)$(ETCDIR); \ install -m 644 $(CONF_FILE).new \
$(DESTDIR)$(ETCDIR)/$(CONF_FILE); \
fi fi

5
etc/xbps-src.conf
View File

@ -2,6 +2,11 @@
# Configuration file for xbps-src. # Configuration file for xbps-src.
# #
#
# Directory where XBPS has been installed. By default /usr/local.
#
XBPS_INSTALLDIR=@@XBPS_INSTALL_PREFIX@@
# #
# Global directory where the xbps distribution files are stored. # Global directory where the xbps distribution files are stored.
# Templates, patches and helper files should all be in that directory. # Templates, patches and helper files should all be in that directory.

38
shutils/chroot.sh
View File

@ -120,9 +120,16 @@ install_xbps_utils()
echo "=> Building and installing xbps utils." echo "=> Building and installing xbps utils."
chroot $XBPS_MASTERDIR sh -c \ chroot $XBPS_MASTERDIR sh -c \
"echo /usr/local/lib > /etc/ld.so.conf" "echo /usr/local/lib > /etc/ld.so.conf"
chroot $XBPS_MASTERDIR make -C /xbps for f in bin src cmpver digest pkgdb repo; do
chroot $XBPS_MASTERDIR make -C /xbps install cp -f $XBPS_INSTALLDIR/sbin/xbps-$f $xbps_prefix/sbin
chroot $XBPS_MASTERDIR make -C /xbps clean done
cp -a $XBPS_INSTALLDIR/lib/libxbps.so* $xbps_prefix/lib
if [ -z $XBPS_INSTALLDIR ]; then
installdir=/usr/share/xbps
else
installdir=$XBPS_INSTALLDIR/share/xbps
fi
cp -a $installdir $xbps_prefix/share
rebuild_ldso_cache rebuild_ldso_cache
fi fi
} }
@ -265,21 +272,22 @@ for f in ${REQDIRS}; do
done done
unset f REQDIRS unset f REQDIRS
echo "XBPS_DISTRIBUTIONDIR=/xbps" > $XBPS_MASTERDIR/usr/local/etc/xbps.conf XBPSSRC_CF=$XBPS_MASTERDIR/usr/local/etc/xbps-src.conf
echo "XBPS_MASTERDIR=/" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf
echo "XBPS_DESTDIR=/xbps_destdir" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_DISTRIBUTIONDIR=/xbps" > $XBPSSRC_CF
echo "XBPS_PACKAGESDIR=/xbps_packagesdir" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_MASTERDIR=/" >> $XBPSSRC_CF
echo "XBPS_BUILDDIR=/xbps_builddir" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_DESTDIR=/xbps_destdir" >> $XBPSSRC_CF
echo "XBPS_SRCDISTDIR=/xbps_srcdistdir" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_PACKAGESDIR=/xbps_packagesdir" >> $XBPSSRC_CF
echo "XBPS_CFLAGS=\"$XBPS_CFLAGS\"" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_BUILDDIR=/xbps_builddir" >> $XBPSSRC_CF
echo "XBPS_CXXFLAGS=\"\$XBPS_CFLAGS\"" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_SRCDISTDIR=/xbps_srcdistdir" >> $XBPSSRC_CF
echo "XBPS_CFLAGS=\"$XBPS_CFLAGS\"" >> $XBPSSRC_CF
echo "XBPS_CXXFLAGS=\"\$XBPS_CFLAGS\"" >> $XBPSSRC_CF
if [ -n "$XBPS_MAKEJOBS" ]; then if [ -n "$XBPS_MAKEJOBS" ]; then
echo "XBPS_MAKEJOBS=$XBPS_MAKEJOBS" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_MAKEJOBS=$XBPS_MAKEJOBS" >> $XBPSSRC_CF
fi fi
if [ -n "$XBPS_CROSS_TARGET" -a -d "$XBPS_CROSS_DIR" ]; then if [ -n "$XBPS_CROSS_TARGET" -a -d "$XBPS_CROSS_DIR" ]; then
echo "XBPS_CROSS_TARGET=$XBPS_CROSS_TARGET" >> \ echo "XBPS_CROSS_TARGET=$XBPS_CROSS_TARGET" >> $XBPSSRC_CF
$XBPS_MASTERDIR/usr/local/etc/xbps.conf echo "XBPS_CROSS_DIR=/xbps_crossdir" >> $XBPSSRC_CF
echo "XBPS_CROSS_DIR=/xbps_crossdir" >> $XBPS_MASTERDIR/usr/local/etc/xbps.conf
fi fi