fix rootfs and init script handling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8293 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
1bf3b5183d
commit
48ed3043e3
2
Makefile
2
Makefile
|
@ -48,7 +48,7 @@ distclean: dirclean
|
||||||
# check prerequisites before starting to build
|
# check prerequisites before starting to build
|
||||||
prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;
|
prereq: $(package/stamp-prereq) $(target/stamp-prereq) ;
|
||||||
|
|
||||||
world: .config $(tools/stamp-install) $(toolchain/stamp-install) $(target/stamp-compile) $(package/stamp-compile) $(package/stamp-install) $(target/stamp-install) FORCE
|
world: .config $(tools/stamp-install) $(toolchain/stamp-install) $(target/stamp-compile) $(package/stamp-cleanup) $(package/stamp-compile) $(package/stamp-install) $(package/stamp-rootfs-prepare) $(target/stamp-install) FORCE
|
||||||
$(MAKE) package/index
|
$(MAKE) package/index
|
||||||
|
|
||||||
package/symlinks:
|
package/symlinks:
|
||||||
|
|
|
@ -15,10 +15,11 @@ $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
|
||||||
$(curdir)/builddirs-install:=. $(sort $(package-y))
|
$(curdir)/builddirs-install:=. $(sort $(package-y))
|
||||||
|
|
||||||
$(curdir)/install:=$(curdir)/install-cleanup
|
$(curdir)/install:=$(curdir)/install-cleanup
|
||||||
$(curdir)/install-cleanup:
|
|
||||||
|
$(curdir)/cleanup:
|
||||||
rm -rf $(BUILD_DIR)/root
|
rm -rf $(BUILD_DIR)/root
|
||||||
$(MAKE) install-targets
|
|
||||||
$(MAKE) preconfig
|
$(curdir)/rootfs-prepare:
|
||||||
@if [ -d $(TOPDIR)/files ]; then \
|
@if [ -d $(TOPDIR)/files ]; then \
|
||||||
$(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
|
$(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
|
||||||
fi
|
fi
|
||||||
|
@ -33,16 +34,19 @@ $(curdir)/install-cleanup:
|
||||||
@-find $(BUILD_DIR)/root -name CVS | $(XARGS) rm -rf
|
@-find $(BUILD_DIR)/root -name CVS | $(XARGS) rm -rf
|
||||||
@-find $(BUILD_DIR)/root -name .svn | $(XARGS) rm -rf
|
@-find $(BUILD_DIR)/root -name .svn | $(XARGS) rm -rf
|
||||||
@-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
|
@-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
|
||||||
|
@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
|
||||||
$(curdir)/index: FORCE
|
|
||||||
(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
|
|
||||||
|
|
||||||
$(curdir)/flags-install:= -j1
|
$(curdir)/flags-install:= -j1
|
||||||
|
|
||||||
$(eval $(call stampfile,$(curdir),package,prereq))
|
$(eval $(call stampfile,$(curdir),package,prereq))
|
||||||
|
$(eval $(call stampfile,$(curdir),package,cleanup))
|
||||||
$(eval $(call stampfile,$(curdir),package,compile))
|
$(eval $(call stampfile,$(curdir),package,compile))
|
||||||
$(eval $(call stampfile,$(curdir),package,install))
|
$(eval $(call stampfile,$(curdir),package,install))
|
||||||
|
$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
|
||||||
|
|
||||||
$($(curdir)/stamp-install): $($(curdir)/stamp-compile)
|
$($(curdir)/stamp-cleanup): $(TMP_DIR)/.build
|
||||||
|
$($(curdir)/stamp-compile): $($(curdir)/stamp-cleanup) $(TMP_DIR)/.build
|
||||||
|
$($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(TMP_DIR)/.build
|
||||||
|
$($(curdir)/stamp-rootfs-prepare): $($(curdir)/stamp-install) $(TMP_DIR)/.build
|
||||||
|
|
||||||
$(eval $(call subdir,$(curdir)))
|
$(eval $(call subdir,$(curdir)))
|
||||||
|
|
Loading…
Reference in New Issue