diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-23 00:49:42 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-06-23 00:49:42 +0000 |
| commit | 9dfcb239f2c42e3a9ef3eef0d675848be949ecf6 (patch) | |
| tree | bb0a9ad724136f12f5be07e91b2a51cd2395eff6 | |
| parent | 262b0cd565e8eaed38fb0f366570c063018dbc2b (diff) | |
.pkginfo cleanup #2
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4053 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/kernel-build.mk | 2 | ||||
| -rw-r--r-- | include/kernel.mk | 12 | ||||
| -rw-r--r-- | package/base-files/Makefile | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/kernel-build.mk b/include/kernel-build.mk index fc62127ca..d3c47281f 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,4 +1,4 @@ -include $(INCLUDE_DIR)/modules-$(KERNEL).mk +-include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ diff --git a/include/kernel.mk b/include/kernel.mk index 849299802..c110f687a 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,9 +1,9 @@ -KERNEL:=kernel -BOARD:=board -LINUX_VERSION:=kernel - -ifneq ($(DUMP),1) -include $(TOPDIR)/.kernel.mk +ifeq ($(DUMP),1) + KERNEL:=<KERNEL> + BOARD:=<BOARD> + LINUX_VERSION:=<LINUX_VERSION> +else +-include $(TOPDIR)/.kernel.mk ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) KERNEL:=2.4 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 7db0d0503..f81c681c2 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -18,6 +18,9 @@ ifneq ($(DUMP),1) TARGET:=-$(BOARD)-$(KERNEL) UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version} LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version} +else +UCLIBC_VERSION:=<UCLIBC_VERSION> +LIBGCC_VERSION:=<LIBGCC_VERSION> endif CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files) |