Generate all packages and copy them to packages/.

diff --git a/make.sh b/make.sh
index 832e6fec45531f668424093cf9fcb77c8ba3fa68..63304209566b81a132d5841c46ced68a82e51346 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -461,10 +461,12 @@ packages_build() {
        beautify message DONE
 
        # Build packages
-       #local package
-       #for package in $BASEDIR/lfs/*; do
-       #       package_make $(basename $package)
-       #done
+       local package
+       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 ba9a357775f69c340de116c785e87dc8e56cfdfc..96d728685383329f0f6c83c1601e311214e9026d 100755 (executable)
--- a/src/pakfire/compressor
+++ b/src/pakfire/compressor
@@ -30,7 +30,7 @@ if [ -z "$TARGET" ]; then
 fi
 
 if [ ! -e "$ROOTFILE" ]; then
-       echo "Rootfile does not exist." >&2
+       echo "Rootfile does not exist: $ROOTFILE" >&2
        exit 1
 fi
 
@@ -38,9 +38,15 @@ PKG_LIST="normal"
 # Checking for a devel package
 grep -q "^D" $ROOTFILE && PKG_LIST="$PKG_LIST devel"
 
+if [ -n "${PKG_VER}" ]; then
+    PKG_STRING="${PKG_NAME}-${PKG_VER}"
+else
+    PKG_STRING="${PKG_NAME}"
+fi
+
 for PKG_EXTRA in $PKG_LIST; do
        # Prepare target name.
-       PKG_TARGET=${PKG_NAME}-${PKG_VER}-${SNAME}-${PKG_REL}
+       PKG_TARGET=${PKG_STRING}-${SNAME}-${PKG_REL}
        if [ "$PKG_EXTRA" != "normal" ]; then
                PKG_TARGET="$PKG_TARGET-$PKG_EXTRA"
        fi
@@ -73,7 +79,8 @@ for PKG_EXTRA in $PKG_LIST; do
 
        echo "$FILELIST" | cpio -o | lzma -czv - > $ARCHIEVE
 
-       cat $ARCHIEVE > /tmp/$PKG_TARGET
+       mkdir -p /images/packages 2>/dev/null
+       cat $ARCHIEVE > /images/packages/$PKG_TARGET
 
        rm -f $ARCHIEVE
 done