From 5296396025264c2b023ecaa8b1fdf063ce9f2873 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 18:54:24 +0100 Subject: simplify base-files package and default on no extra PKG_ID is needed anymore, we do not use filesystem or target specific startup scripts. Ignore .menu. --- package/base-files/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'package/base-files/Makefile') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 922bdb47e..1e0cbdafc 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,22 +6,18 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 8 +PKG_RELEASE:= 9 PKG_DESCR:= basic filesystem structure and scripts PKG_SECTION:= base WRKDIST= ${WRKDIR}/base-files NO_DISTFILES:= 1 -ifeq ($(CPU_ARCH),x86_64) -PKG_ID= x86-64-${FS} -else -PKG_ID= ${ADK_TARGET}-${FS} -endif -WRKDIR= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-${PKG_ID} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +PKGDFLT_BASE_FILES= y do-install: $(CP) ./extra/* $(IDIR_BASE_FILES) -- cgit v1.2.3 From 2c3389799c46724a4922179ff70d1230ccbe5b59 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 23 Dec 2009 11:34:44 +0100 Subject: fixes for new pkgmaker generated menu --- package/base-files/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/base-files/Makefile') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 1e0cbdafc..bff93bd38 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -17,7 +17,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -PKGDFLT_BASE_FILES= y +PKGDFLT_BASE_FILES= y if !ADK_TOOLCHAIN_ONLY do-install: $(CP) ./extra/* $(IDIR_BASE_FILES) -- cgit v1.2.3