summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-06-09 07:56:20 +0000
committerSteven Barth <steven@midlink.org>2008-06-09 07:56:20 +0000
commit64806f32bea453b9a6fc5c4cf4c4b751a749e369 (patch)
treefa8916e368bebfdbb07451928d8aa119214945fd
parent004213483340028437736f5810bd1c2274b7b72c (diff)
* Made Makefiles attribute aware
-rw-r--r--Makefile2
-rwxr-xr-xapplications/community-halle/ipkg/postinst (renamed from contrib/package/luci/ipkg/luci-ff-halle.postinst)0
-rwxr-xr-xapplications/community-hannover/ipkg/postinst (renamed from contrib/package/luci/ipkg/luci-ff-hannover.postinst)0
-rwxr-xr-xapplications/community-leipzig/ipkg/postinst (renamed from contrib/package/luci/ipkg/luci-ff-leipzig.postinst)0
-rwxr-xr-x[-rw-r--r--]applications/luci-fw/root/etc/init.d/luci_fw0
-rwxr-xr-xapplications/luci-statistics/ipkg/postinst (renamed from contrib/package/luci/ipkg/luci-statistics.postint)0
-rwxr-xr-x[-rw-r--r--]applications/luci-statistics/root/etc/init.d/luci_statistics0
-rw-r--r--build/module.mk4
-rw-r--r--contrib/package/luci/Makefile11
-rwxr-xr-xlibs/sgi-haserl/ipkg/postinst (renamed from contrib/package/luci/ipkg/luci-sgi-haserl.postinst)0
10 files changed, 5 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index fa9a40730..38e2d1552 100644
--- 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
index 0efb5a9a7..0efb5a9a7 100755
--- a/contrib/package/luci/ipkg/luci-ff-halle.postinst
+++ b/applications/community-halle/ipkg/postinst
diff --git a/contrib/package/luci/ipkg/luci-ff-hannover.postinst b/applications/community-hannover/ipkg/postinst
index b41179f72..b41179f72 100755
--- a/contrib/package/luci/ipkg/luci-ff-hannover.postinst
+++ b/applications/community-hannover/ipkg/postinst
diff --git a/contrib/package/luci/ipkg/luci-ff-leipzig.postinst b/applications/community-leipzig/ipkg/postinst
index 5aff5db95..5aff5db95 100755
--- a/contrib/package/luci/ipkg/luci-ff-leipzig.postinst
+++ b/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
index 5f09b5277..5f09b5277 100644..100755
--- a/applications/luci-fw/root/etc/init.d/luci_fw
+++ b/applications/luci-fw/root/etc/init.d/luci_fw
diff --git a/contrib/package/luci/ipkg/luci-statistics.postint b/applications/luci-statistics/ipkg/postinst
index 69fe0c016..69fe0c016 100755
--- a/contrib/package/luci/ipkg/luci-statistics.postint
+++ b/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
index 54faa411d..54faa411d 100644..100755
--- a/applications/luci-statistics/root/etc/init.d/luci_statistics
+++ b/applications/luci-statistics/root/etc/init.d/luci_statistics
diff --git a/build/module.mk b/build/module.mk
index 228860838..7fe96cac5 100644
--- 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 b438760f5..7557c827e 100644
--- 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
index 483a0867a..483a0867a 100755
--- a/contrib/package/luci/ipkg/luci-sgi-haserl.postinst
+++ b/libs/sgi-haserl/ipkg/postinst