* Made Makefiles attribute aware

diff --git a/Makefile b/Makefile
index fa9a407303108e79771325151a829ff21afe718c..38e2d155222f67ec039af64b963c58cae059011d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ luahost: luabuild hostcopy
 
 hostcopy: 
        mkdir -p host
-       for i in $(MODULES); do cp $$i/dist/* host/ -R 2>/dev/null || true; done
+       for i in $(MODULES); do cp -a $$i/dist/* host/ -R 2>/dev/null || true; done
        rm -f host/luci
        ln -s .$(LUCI_INSTALLDIR) host/luci
 

diff --git a/contrib/package/luci/ipkg/luci-ff-halle.postinst b/applications/community-halle/ipkg/postinst
similarity index 100%
rename from contrib/package/luci/ipkg/luci-ff-halle.postinst
rename to applications/community-halle/ipkg/postinst

diff --git a/contrib/package/luci/ipkg/luci-ff-hannover.postinst b/applications/community-hannover/ipkg/postinst
similarity index 100%
rename from contrib/package/luci/ipkg/luci-ff-hannover.postinst
rename to applications/community-hannover/ipkg/postinst

diff --git a/contrib/package/luci/ipkg/luci-ff-leipzig.postinst b/applications/community-leipzig/ipkg/postinst
similarity index 100%
rename from contrib/package/luci/ipkg/luci-ff-leipzig.postinst
rename to applications/community-leipzig/ipkg/postinst

diff --git a/applications/luci-fw/root/etc/init.d/luci_fw b/applications/luci-fw/root/etc/init.d/luci_fw
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/contrib/package/luci/ipkg/luci-statistics.postint b/applications/luci-statistics/ipkg/postinst
similarity index 100%
rename from contrib/package/luci/ipkg/luci-statistics.postint
rename to applications/luci-statistics/ipkg/postinst

diff --git a/applications/luci-statistics/root/etc/init.d/luci_statistics b/applications/luci-statistics/root/etc/init.d/luci_statistics
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/build/module.mk b/build/module.mk
index 2288608386167aaf03c0e699cb4cf6595b20cf58..7fe96cac50946955f55e1fb9b64ed9528aac250b 100644 (file)
--- a/build/module.mk
+++ b/build/module.mk
@@ -13,8 +13,8 @@ clean: luaclean
 
 luasource:
        mkdir -p dist$(LUCI_INSTALLDIR)
-       cp root/* dist -R 2>/dev/null || true
-       cp luasrc/* dist$(LUCI_INSTALLDIR) -R 2>/dev/null || true
+       cp -a root/* dist -R 2>/dev/null || true
+       cp -a luasrc/* dist$(LUCI_INSTALLDIR) -R 2>/dev/null || true
        for i in $$(find dist -name .svn); do rm $$i -rf; done  
        
 luacompile: luasource

diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile
index b438760f5ac78c7de777b9f081220870980e5bad..7557c827e2f7636b7e483381e78285f8f8829893 100644 (file)
--- a/contrib/package/luci/Makefile
+++ b/contrib/package/luci/Makefile
@@ -62,7 +62,8 @@ endef
 
 
 define Package/luci/install/template
-       $(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+       $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+       $(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true
 endef
 
 
@@ -163,7 +164,6 @@ endef
 
 define Package/luci-ff-halle/install
        $(call Package/luci/install/template,$(1),applications/community-halle)
-       $(CP) -a ./ipkg/luci-ff-halle.postinst $(1)/CONTROL/postinst
 endef
 
 
@@ -181,7 +181,6 @@ endef
 
 define Package/luci-ff-leipzig/install
        $(call Package/luci/install/template,$(1),applications/community-leipzig)
-       $(CP) -a ./ipkg/luci-ff-leipzig.postinst $(1)/CONTROL/postinst
 endef
 
 
@@ -199,7 +198,6 @@ endef
 
 define Package/luci-ff-hannover/install
        $(call Package/luci/install/template,$(1),applications/community-hannover)
-       $(CP) -a ./ipkg/luci-ff-hannover.postinst $(1)/CONTROL/postinst
 endef
 
 
@@ -257,7 +255,6 @@ endef
 
 define Package/luci-app-firewall/install
        $(call Package/luci/install/template,$(1),applications/luci-fw)
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-fw/dist/etc/init.d/luci_fw $(1)/etc/init.d
 endef
 
 
@@ -315,9 +312,6 @@ endef
 
 define Package/luci-app-statistics/install
        $(call Package/luci/install/template,$(1),applications/luci-statistics)
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/usr/bin/stat-genconfig $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/etc/init.d/luci_statistics $(1)/etc/init.d
-       $(CP) -a ./ipkg/luci-statistics.postinst $(1)/CONTROL/postinst
 endef
 
 
@@ -331,7 +325,6 @@ endef
 
 define Package/luci-sgi-haserl/install
        $(call Package/luci/install/template,$(1),libs/sgi-haserl)
-       $(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst
 endef
 
 

diff --git a/contrib/package/luci/ipkg/luci-sgi-haserl.postinst b/libs/sgi-haserl/ipkg/postinst
similarity index 100%
rename from contrib/package/luci/ipkg/luci-sgi-haserl.postinst
rename to libs/sgi-haserl/ipkg/postinst