merge another batch of code from michael buesch's wireless-dev tree, fix up extpci...

[openwrt.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 061d604..c0b17aa 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -21,20 +21,23 @@ endif
 ifneq ($(CONFIG_PCMCIA),)
   FEATURES += pcmcia
 endif
 ifneq ($(CONFIG_PCMCIA),)
   FEATURES += pcmcia
 endif

+ifneq ($(CONFIG_VIDEO_DEV),)
+  FEATURES += video
+endif

 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))
 
 # For target profile selection - the default set
 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))
 
 # For target profile selection - the default set

-DEFAULT_PACKAGES:=base-files libgcc uclibc bridge busybox dnsmasq dropbear iptables mtd ppp ppp-mod-pppoe mtd
+DEFAULT_PACKAGES:=base-files libgcc uclibc bridge busybox dnsmasq dropbear iptables mtd ppp ppp-mod-pppoe mtd kmod-ipt-nathelper

 
 ifeq ($(DUMP),1)
   all: dumpinfo
 else
   all: compile
 endif
 
 ifeq ($(DUMP),1)
   all: dumpinfo
 else
   all: compile
 endif

-KERNEL:=2.$(word 2,$(subst ., ,$(strip $(LINUX_VERSION))))

 
 

+include $(INCLUDE_DIR)/kernel-version.mk

 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/kernel.mk
 


@@ -56,6 +59,9 @@ KERNELNAME=
 ifneq (,$(findstring x86,$(BOARD)))
   KERNELNAME="bzImage"
 endif
 ifneq (,$(findstring x86,$(BOARD)))
   KERNELNAME="bzImage"
 endif

+ifneq (,$(findstring rdc,$(BOARD)))
+  KERNELNAME="bzImage"
+endif

 ifneq (,$(findstring ppc,$(BOARD)))
   KERNELNAME="uImage"
 endif
 ifneq (,$(findstring ppc,$(BOARD)))
   KERNELNAME="uImage"
 endif


@@ -203,10 +209,15 @@ endef
 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))
 define Profile
   $(eval $(call Profile/Default))
   $(eval $(call Profile/$(1)))

+  $(eval $(call shexport,Profile/$(1)/Description))

   DUMPINFO += \
        echo "Target-Profile: $(1)"; \
        echo "Target-Profile-Name: $(NAME)"; \
   DUMPINFO += \
        echo "Target-Profile: $(1)"; \
        echo "Target-Profile-Name: $(NAME)"; \

-       echo "Target-Profile-Packages: $(PACKAGES)"; 
+       echo "Target-Profile-Packages: $(PACKAGES)"; \
+       echo "Target-Profile-Description:"; \
+       getvar "$(call shvar,Profile/$(1)/Description)"; \
+       echo "@@"; \
+       echo;

 endef
 
 $(eval $(call shexport,Target/Description))
 endef
 
 $(eval $(call shexport,Target/Description))