Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into...

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

diff --git a/lfs/Config b/lfs/Config
index 82dbab8fb29ec0434e8562617d70fcdb83567630..b91f2ee63d06705c06d2c1fe13e4a243f93f007a 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -37,12 +37,6 @@ URL_IPFIRE  = http://source.ipfire.org/source-2.x
 URL_TOOLCHAIN = http://source.ipfire.org/toolchains
 URL_SOURCE = source.ipfire.org:/pub/source/source-2.x
 
-# Default compiler optimizations.
-#
-FLAGS_OPT   = -O2
-FLAGS_CPU   = -mcpu=$(MACHINE)
-FLAGS_ARCH  = -march=$(MACHINE)
-
 # Don't change this; it will be overridden by other makefiles where necessary.
 #
 ROOT =
@@ -191,7 +185,12 @@ define PAK
                cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
                /install/packages/package; \
        fi
-       cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
+       for i in $(DIR_SRC)/config/rootfiles/packages/{$(MACHINE),}/$(PROG); do \
+               if [ -e "$${i}" ]; then \
+                       cp -v $${i} /install/packages/package/ROOTFILES; \
+                       break; \
+               fi; \
+       done
        sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
        sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh