From a9aeddb065f388787a6f75533c383ed55956b02a Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Fri, 23 Jun 2006 00:49:42 +0000
Subject: [PATCH] .pkginfo cleanup #2

SVN-Revision: 4053
---
 openwrt/include/kernel-build.mk     |  2 +-
 openwrt/include/kernel.mk           | 12 ++++++------
 openwrt/package/base-files/Makefile |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/openwrt/include/kernel-build.mk b/openwrt/include/kernel-build.mk
index fc62127ca2..d3c47281fa 100644
--- 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) \
diff --git a/openwrt/include/kernel.mk b/openwrt/include/kernel.mk
index 8492998020..c110f687a3 100644
--- 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
diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile
index 7db0d0503c..f81c681c26 100644
--- 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)
-- 
2.25.1