Change localhost into a fully qualified name; remove OpenWrt alias to 127.0.0.1

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

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 2e67450..1ac847e 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


@@ -63,8 +69,9 @@ endif
 
 define Kernel/Prepare/Default
        bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)
 
 define Kernel/Prepare/Default
        bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS)

-       [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches 
-       [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches
+       if [ -d $(GENERIC_PLATFORM_DIR)/patches ]; then $(PATCH) $(LINUX_DIR) $(GENERIC_PLATFORM_DIR)/patches; fi
+       if [ -d ./files ]; then $(CP) ./files/* $(LINUX_DIR)/; fi
+       if [ -d ./patches ]; then $(PATCH) $(LINUX_DIR) ./patches; fi

 endef
 define Kernel/Prepare
        $(call Kernel/Prepare/Default)
 endef
 define Kernel/Prepare
        $(call Kernel/Prepare/Default)


@@ -93,8 +100,8 @@ endef
 
 
 define Kernel/CompileModules/Default
 
 
 define Kernel/CompileModules/Default

-       $(MAKE) -j$(CONFIG_JLEVEL) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules
-       $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install
+       $(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" modules
+       $(MAKE) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install

 endef
 define Kernel/CompileModules
        $(call Kernel/CompileModules/Default)
 endef
 define Kernel/CompileModules
        $(call Kernel/CompileModules/Default)


@@ -110,7 +117,7 @@ ifeq ($(KERNEL),2.6)
                echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
                echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
                mkdir -p $(BUILD_DIR)/root/etc/init.d
                echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
                echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
                mkdir -p $(BUILD_DIR)/root/etc/init.d

-               $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/
+               $(CP) $(GENERIC_PLATFORM_DIR)/files/init $(BUILD_DIR)/root/

     endef
   else
     define Kernel/SetInitramfs
     endef
   else
     define Kernel/SetInitramfs


@@ -123,7 +130,7 @@ ifeq ($(KERNEL),2.6)
 endif
 define Kernel/CompileImage/Default
        $(call Kernel/SetInitramfs)
 endif
 define Kernel/CompileImage/Default
        $(call Kernel/SetInitramfs)

-       $(MAKE) -j$(CONFIG_JLEVEL) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME)
+       $(MAKE) -j$(CONFIG_JLEVEL) $(KERNEL_MAKEOPTS) CC="$(KERNEL_CC)" $(KERNELNAME)

        $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
 endef
 define Kernel/CompileImage
        $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $(LINUX_DIR)/vmlinux $(LINUX_KERNEL)
 endef
 define Kernel/CompileImage


@@ -203,10 +210,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))