Zwischencommit fuer LFS.

[ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index af89c7ba8e5cb38684034866dcfacc621f5e2765..9a81690c7918eb983532debda427d908067f7e7c 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -86,25 +86,27 @@ ifeq "$(ROOT)" ""
 define POSTBUILD
        @echo "Install done; saving file list to $(DIR_INFO)/$(THISAPP) ..."
        @$(FIND_FILES) > $(DIR_SRC)/lsalrnew
-       @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' | sort > $(TARGET)_1
+       @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' | sort > $(TARGET)_diff
        @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
        @rm -f $(DIR_SRC)/lsalrnew
-       sed -i -e 's+.\/++' $(TARGET)_1
+       sed -i -e 's+.\/++' $(TARGET)_diff
        # compare roofile ( same name as lfs script) with the list of installed files
        # special cases
-       # - on a partial rebuild without a new file inside TARGET_1, just touch TARGET
-       if [ -s "$(TARGET)_1" ]; then \
+       # - on a partial rebuild without a new file inside TARGET_diff, just touch TARGET
+       if [ -s "$(TARGET)_diff" ]; then \
                ROOTFILE=$(DIR_SRC)/src/ROOTFILES.$(MACHINE); \
-               for line in `cat $(TARGET)_1`; do \
-                       if grep -qE "^#$$line$$" $$ROOTFILE ; then echo "#$$line" >> $(TARGET); \
-                       elif grep -qE "^$$line$$" $$ROOTFILE ; then echo "$$line" >> $(TARGET); \
+               sed "s/KVER/$(KVER)/g" $$ROOTFILE > $(TARGET)_rootfile; \
+               for line in `cat $(TARGET)_diff`; do \
+                       if grep -qE "^#$$line$$" $(TARGET)_rootfile ; then echo "#$$line" >> $(TARGET); \
+                       elif grep -qE "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
                        else echo "+$$line" >> $(TARGET); \
                        fi; \
                done; \
+               rm -f $(TARGET)_rootfile; \
        else \
                touch $(TARGET); \
        fi
-       @rm -f $(TARGET)_1
+       @rm -f $(TARGET)_diff
 endef
 else
 define POSTBUILD
@@ -130,22 +132,9 @@ define MD5
        # error mean file signature don't match the one in lfs script
        [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]
        echo "$@ checksum OK"
+       echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log
 endef
 
 define PAK
-       @rm -rf /install/packages/package /tmp/* /packagetmp.tar
-       cd /
-       mkdir -p  /install/packages/package
-       cp -f $(DIR_SRC)/src/paks/$(PROG)/{,un}install.sh /install/packages/package
-       cp -f $(DIR_SRC)/src/paks/$(PROG)/ROOTFILES       /install/packages/package
-       chmod 755 /install/packages/package/{,un}install.sh
-       tar --create -C / --files-from=/install/packages/package/ROOTFILES -f /packagetmp.tar --exclude='#*'
-       tar -x -C /tmp -f /packagetmp.tar
-       @rm -f /packagetmp.tar
-       @cd /tmp
-       tar zvcf /install/packages/package/files.tgz * -C /tmp
-       rm -rf /tmp/*
-       cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES && tar cfz ../$(PROG)-$(VER)-$(PAK_VER).tar.gz files.tgz install.sh uninstall.sh ROOTFILES
-       cd /install/packages && md5sum $(THISAPP)-$(PAK_VER).tar.gz > $(PROG)-$(VER)-$(PAK_VER).tar.gz.md5
-       @rm -rf /install/packages/package
+       /usr/local/bin/packager $(PROG) $(VER) $(PAK_VER)
 endef