fix initscripts activation (closes: #4037, #4745)

[openwrt/openwrt.git] / target / imagebuilder / files / Makefile

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 27a6c94f9db24a380d866ba0d1b5f2937295789f..b52692517778fd16bb16af180922c50f1ed67418 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -79,7 +79,7 @@ info: FORCE
 $(TOPDIR)/tmp/ipkg.conf: FORCE
        @mkdir -p $(TOPDIR)/tmp
        @echo 'dest root /' > $@
 $(TOPDIR)/tmp/ipkg.conf: FORCE
        @mkdir -p $(TOPDIR)/tmp
        @echo 'dest root /' > $@

-       @echo 'src packages file:$(TOPDIR)/packages' >> $@
+       @echo 'src packages file:$(PACKAGE_DIR)' >> $@

 
 BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
 ifeq ($(KERNEL),2.4)
 
 BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
 ifeq ($(KERNEL),2.4)


@@ -131,10 +131,10 @@ package_postinst: FORCE
        @echo
        @echo Activating init scripts
        @( \
        @echo
        @echo Activating init scripts
        @( \

-               cd $(BUILD_DIR)/root; \
+               cd $(TARGET_DIR); \

                for script in ./etc/init.d/*; do \
                        grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
                for script in ./etc/init.d/*; do \
                        grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \

-                       IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
+                       IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \

                done || true; \
        )
 
                done || true; \
        )