Changed path of packages.

diff --git a/make.sh b/make.sh
index 2d376671c3a604fd74f65d070807e33b4f0499e7..9460a7408bb1c79ecea32c860a962d0b8ee2a1a7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -465,8 +465,6 @@ packages_build() {
        for package in $BASEDIR/lfs/*; do
                package_make $(basename $package)
        done
-       mkdir -p $BASEDIR/packages/${TARGET} 2>/dev/null
-       mv $LFS/$IMAGES_DIR/packages/* $BASEDIR/packages/${TARGET}/ >>$LOGFILE 2>&1
 
        if [ ${EMB} -eq 0 ]; then
                ipfire_make initramfs

diff --git a/src/pakfire/compressor b/src/pakfire/compressor
index 96d728685383329f0f6c83c1601e311214e9026d..1815e2d1ddf707825d1364ca198b19681d51c789 100755 (executable)
--- a/src/pakfire/compressor
+++ b/src/pakfire/compressor
@@ -79,8 +79,7 @@ for PKG_EXTRA in $PKG_LIST; do
 
        echo "$FILELIST" | cpio -o | lzma -czv - > $ARCHIEVE
 
-       mkdir -p /images/packages 2>/dev/null
-       cat $ARCHIEVE > /images/packages/$PKG_TARGET
+       cat $ARCHIEVE > /packages/$PKG_TARGET
 
        rm -f $ARCHIEVE
 done

diff --git a/tools/make-include b/tools/make-include
index cd91c635865ecf8c0619d3de8afdaadb8e7ea478..c86927e588f262a78c11fe3168f1b04dfc3dde6c 100644 (file)
--- a/tools/make-include
+++ b/tools/make-include
@@ -540,11 +540,12 @@ prepareenv() {
        mkdir -p $BASEDIR/build_${TARGET}/{$TOOLS_DIR,cdrom,$INSTALLER_DIR,$IMAGES_DIR} 2>/dev/null
        mkdir -p $BASEDIR/{cache,ccache,distcc} 2>/dev/null
        mkdir -p $BASEDIR/cache/{toolchains,patches,tarballs} 2>/dev/null
+       mkdir -p $BASEDIR/packages_${TARGET} 2>/dev/null
        mkdir -p $LFS/{$TOOLS_DIR,usr/src} 2>/dev/null
        mkdir -p $LFS/{dev,etc,proc,sys} 2>/dev/null
        mkdir -p $LFS/dev/pts 2>/dev/null
        mkdir -p $LFS/usr/src/{cache,config,doc,lfs,log_${TARGET},src,ccache,distcc} 2>/dev/null
-       mkdir -p $LFS/{$INSTALLER_DIR,cdrom,images} 2>/dev/null
+       mkdir -p $LFS/{$INSTALLER_DIR,cdrom,images,packages} 2>/dev/null
 
        mknod -m 600 $BASEDIR/build/dev/console c 5 1 2>/dev/null
        mknod -m 666 $BASEDIR/build/dev/null c 1 3 2>/dev/null
@@ -565,6 +566,7 @@ prepareenv() {
        mount --bind $BASEDIR/build_${TARGET}/$CDROM_DIR        $LFS/$CDROM_DIR
        mount --bind $BASEDIR/build_${TARGET}/$INSTALLER_DIR    $LFS/$INSTALLER_DIR
        mount --bind $BASEDIR/build_${TARGET}/$IMAGES_DIR       $LFS/$IMAGES_DIR
+       mount --bind $BASEDIR/packages_${TARGET}        $LFS/packages
 
        # Run LFS static binary creation scripts one by one
        export CCACHE_DIR=$BASEDIR/ccache
@@ -723,7 +725,7 @@ puttarget() {
        rm -rf ${BASEDIR}/${HOSTNAME} 2>/dev/null
        mkdir -p ${DIR}
 
-       [ -e "${BASEDIR}/packages" ] && cp -al ${BASEDIR}/packages ${DIR}
+       [ -e "${BASEDIR}/packages_${TARGET}" ] && cp -al ${BASEDIR}/packages_${TARGET} ${DIR}
        [ -e "${BATCHLOG}" ] && \
                python ${BASEDIR}/tools/alog2html < ${BATCHLOG} > ${DIR}/build_log.html
        pkg_list_packages > ${DIR}/packages-list.txt