Made decompression.

diff --git a/lfs/Config b/lfs/Config
index c758a77211041132270ed1461732f6349bed81e2..70cc760fe6a21761dba971009ef8a790e833af61 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -121,7 +121,7 @@ define DO_PKG_INFO
        @echo "local PKG_LICENSE=\"$(LICENSE)\""
        @echo "local PKG_MAINTAINER=\"$(MAINTAINER)\""
        @echo "local PKG_NAME=\"$(PKG_NAME)\""
-       @echo "local PKG_PACKAGE=\"$(PKG_PACKAGE)\""
+       @echo "local PKG_PACKAGES=\"$(PACKAGES)\""
        @echo "local PKG_VER=\"$(PKG_VER)\""
        @echo "local PKG_REL=\"$(PKG_REL)\""
        @echo "local PKG_SHORT=\"$(value SHORT_DESC)\""

diff --git a/lfs/cdrom b/lfs/cdrom
index f192c37fdd7653f35f6f4eb4cdf5525cedd88319..ca0433fe7a328e68554d33b0da94349fba10764c 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -89,7 +89,11 @@ $(OBJECT): $(objects)
 ifeq "$(BUILD_EXTRAS)" "1"
        # Copying extra packages to cdrom
        mkdir -pv $(CDROM_DIR)/packages
-       cd $(DIR_PACKAGES) && cp -vf $(PACKAGES_EXTRA) $(CDROM_DIR)/packages
+       for package in $(PACKAGES_EXTRA); do \
+               if [ -e "$$package" ]; then \
+                       cp -vf $$package $(CDROM_DIR)/packages; \
+               fi; \
+       done
 endif
 
        # Install isolinux & configuration

diff --git a/make.sh b/make.sh
index f17a2a48c940236cbb9080dfb6a625a1e021fe17..230787bdd45ba490ac5318e68d9844be9eabb883 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -474,14 +474,6 @@ packages_build() {
        pkg_list_packages > $BASEDIR/doc/packages-list.txt
        beautify message DONE
 
-       # Build packages
-       local package
-       echo -n "Building packages"
-       for package in $BASEDIR/lfs/*; do
-               package_make $(basename $package) >/dev/null
-       done
-       beautify message DONE
-
        if [ ${EMB} -eq 0 ]; then
                ipfire_make images-core
                ipfire_make images-info

diff --git a/src/pakfire/decompressor b/src/pakfire/decompressor
index a79d9b52314ff6a85786d9ceb518d118dceff6fb..b3ddf9e0113bae8448b24ea6b7f0a8847ce954bf 100755 (executable)
--- a/src/pakfire/decompressor
+++ b/src/pakfire/decompressor
@@ -34,7 +34,7 @@ while [ $# -gt 0 ]; do
                                FILES="$FILES $file"
                        else
                                echo "File does not exist: $file" >&2
-                               exit 1
+                               #exit 1
                        fi
                        ;;
        esac
@@ -55,6 +55,6 @@ FILES=$(for i in $FILES; do echo $i; done | sort -u)
 
 for file in $FILES; do
        echo "Extracting $file..."
-       cpio --extract --quiet --to-stdout data.img < $file | lzmadec | \
-               cpio -diu --no-absolute-filenames --quiet
+       cpio --extract --quiet --to-stdout data.img < $file | \
+               tar --extract --xz -C ${ROOT}
 done

diff --git a/tools/make-include b/tools/make-include
index 30fd7db9445ab031473c5a26a46b574f24b6bee3..bd113cda3a51eea355902aaa9a903999ba23881d 100644 (file)
--- a/tools/make-include
+++ b/tools/make-include
@@ -216,11 +216,11 @@ lfsmakecommoncheck()
        # Append package to the list it belongs to
        if [ "$STAGE" != "packages" ]; then
                if [ "$PKG_CORE" = "yes" ]; then
-                       PACKAGES_CORE="$PACKAGES_CORE $PKG_PACKAGE"
+                       PACKAGES_CORE="$PACKAGES_CORE $PKG_PACKAGES"
                elif [ "$PKG_EXTRA" = "yes" ]; then
-                       PACKAGES_EXTRA="$PACKAGES_EXTRA $PKG_PACKAGE"
+                       PACKAGES_EXTRA="$PACKAGES_EXTRA $PKG_PACKAGES"
                elif [ "$PKG_DEBUG" = "yes" ]; then
-                       PACKAGES_DEBUG="$PACKAGES_DEBUG $PKG_PACKAGE"
+                       PACKAGES_DEBUG="$PACKAGES_DEBUG $PKG_PACKAGES"
                fi
        fi