diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 00:21:59 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-31 00:21:59 +0200 |
| commit | 5e82ed3e9ada7f5c9e66db5568032a49f66a6e93 (patch) | |
| tree | 62da745045b8980a504ca74194126d621c807982 | |
| parent | 5f15b1c8d4938805342426bb4b878ad2205a048d (diff) | |
fix base-files package after ipkg change
| -rw-r--r-- | mk/package.mk | 4 | ||||
| -rw-r--r-- | package/base-files/Makefile | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/mk/package.mk b/mk/package.mk index b635d6a40..27181e276 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -153,10 +153,6 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @for file in conffiles preinst postinst prerm postrm; do \ [ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ done -# FIXME: special case for device dependent base-files package -ifneq ($(strip $${ICONTROL_ADDON_$(1)}),) - echo $${ICONTROL_ADDON_$(1)} >> $${IDIR_$(1)}/CONTROL/control -endif $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE} ifeq ($(ADK_DEBUG),) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 62eebd4c1..52b82b79e 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -20,8 +20,6 @@ else PKG_ID= ${DEVICE}-${FS} endif WRKDIR= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-${PKG_ID} -ICONTROL_BASE_FILES= ipkg/base-files.control -ICONTROL_ADDON_BASE_FILES= "Package: base-files-${PKG_ID}" include $(TOPDIR)/mk/package.mk @@ -58,9 +56,6 @@ endif ln -sf ../proc/mounts $(IDIR_BASE_FILES)/etc/mtab rm -rf $(IDIR_BASE_FILES)/var ln -sf tmp $(IDIR_BASE_FILES)/var - -find $(IDIR_BASE_FILES) -type d -name CVS | xargs rm -rf - -find $(IDIR_BASE_FILES) -type d -name .svn | xargs rm -rf - -find $(IDIR_BASE_FILES) -name '.#*' | xargs rm -f ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz endif |