Pārlūkot izejas kodu

fix base-files package after ipkg change

Waldemar Brodkorb 15 gadi atpakaļ
vecāks
revīzija
5e82ed3e9a
2 mainītis faili ar 0 papildinājumiem un 9 dzēšanām
  1. 0 4
      mk/package.mk
  2. 0 5
      package/base-files/Makefile

+ 0 - 4
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),)

+ 0 - 5
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