.pkginfo cleanup #2

SVN-Revision: 4053
2006-06-23 00:49:42 +00:00 · 2006-06-23 00:49:42 +00:00 · a9aeddb065
commit a9aeddb065
parent f2113df321
3 changed files with 10 additions and 7 deletions
--- a/openwrt/include/kernel-build.mk
+++ b/openwrt/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) \
--- a/openwrt/include/kernel.mk
+++ b/openwrt/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
--- a/openwrt/package/base-files/Makefile
+++ b/openwrt/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)