diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 18:54:24 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-20 18:54:24 +0100 |
| commit | 5296396025264c2b023ecaa8b1fdf063ce9f2873 (patch) | |
| tree | 4541f6a2a5a4a722bee34eb2f97cb640a0d490fa | |
| parent | cdded347f6cf4d7bcc854831d4bffd3bd216eb29 (diff) | |
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.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | package/base-files/Makefile | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 7e9e1ef50..9fb776851 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ dl/ package/*/info.mk tools_build/ extra/ +.menu 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) |