Changeset 08e79f2 in freewrt

Timestamp:

Jul 6, 2006, 2:11:14 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

e82b032

Parents:

7443d5c

Message:

fix an ugly bug, kmod-* packages are not automatically installed
into the firmware. it was not a bad commit, it is/was a bug in openwrt
kamikaze...

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@174 afb5a338-a214-0410-bd46-81f09a774fd1

Files:

• scripts/ipkg (modified) (1 diff)
• target/linux/kernel.mk (modified) (1 diff)
• target/linux/rules.mk (modified) (4 diffs)

scripts/ipkg

@@ -880 +880 @@
 
         if [ -x "$info_dir/$pkg.postinst" ]; then
-                $info_dir/$pkg.postinst configure
+                IPKG_INSTROOT="$IPKG_INSTROOT" $info_dir/$pkg.postinst configure
         fi
 

target/linux/kernel.mk

@@ -69 +69 @@
         @mkdir -p $(TARGET_MODULES_DIR)
         @rm -rf $(LINUX_BUILD_DIR)/root*
-        @cp -fpR $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
+        @$(CP) $(BUILD_DIR)/root $(LINUX_BUILD_DIR)/
         echo -e 'dest root /\noption offline_root $(LINUX_BUILD_DIR)/root' > $(LINUX_BUILD_DIR)/ipkg.conf
         $(MAKE) -C $(TOPDIR)/target/linux/package \
                 $(KPKG_MAKEOPTS) \
                 install
-        @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS) || true; } $(MAKE_TRACE) 
+        [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG_KERNEL) install $(INSTALL_TARGETS)
 
 $(KERNEL_IPKG):

target/linux/rules.mk

@@ -7 +7 @@
 endif
 
-MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
+MODULES_SUBDIR := lib/modules/$(LINUX_VERSION)
 
-LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
+LINUX_BUILD_DIR := $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 LINUX_DIR := $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)
-LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux
+LINUX_KERNEL := $(LINUX_BUILD_DIR)/vmlinux
+LINUX_TARGET_DIR := $(LINUX_BUILD_DIR)/root
 
-LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root
-IPKG_KERNEL:=IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
+IPKG_KERNEL := IPKG_TMP=$(BUILD_DIR)/tmp IPKG_INSTROOT=$(LINUX_TARGET_DIR) IPKG_CONF_DIR=$(LINUX_BUILD_DIR) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends
 
 LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
@@ -24 +24 @@
 )
 
-KPKG_MAKEOPTS:= IPKG="$(IPKG_KERNEL)" \
+KPKG_MAKEOPTS := IPKG="$(IPKG_KERNEL)" \
                 BOARD="$(BOARD)" \
                 KERNEL="$(KERNEL)" \
@@ -56 +56 @@
 
 ifeq ($$(KDEPEND_$(1)),m)
-ifneq ($(BR2_PACKAGE_KMOD_$(1)),)
+ifneq ($$(BR2_PACKAGE_KMOD_$(1)),)
 TARGETS += $$(PKG_$(1))
 endif
-ifeq ($(BR2_PACKAGE_KMOD_$(1)),y)
+ifeq ($$(BR2_PACKAGE_KMOD_$(1)),y)
 INSTALL_TARGETS += $$(PKG_$(1))
 endif
@@ -78 +78 @@
         done
         echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst
-        echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst
+        echo "if [ -z \"\$$$${IPKG_INSTROOT}\" ]; then" >> $$(I_$(1))/CONTROL/postinst
         echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst
         echo "load_modules /etc/modules.d/$(6)-$(2)" >> $$(I_$(1))/CONTROL/postinst
+        echo "fi" >> $$(I_$(1))/CONTROL/postinst
         chmod 0755 $$(I_$(1))/CONTROL/postinst
 endif