unlock linux partition before running jffs2root --clean. fixes #97

[openwrt.git] / openwrt / target / Makefile

diff --git a/openwrt/target/Makefile b/openwrt/target/Makefile
index 88476a7..a14749f 100644 (file)
--- a/openwrt/target/Makefile
+++ b/openwrt/target/Makefile
@@ -1,98 +1,37 @@
 include $(TOPDIR)/rules.mk
 
-# Default target skeleton stuff, may be overridden
-TARGET_SKEL_DIR=default/target_skeleton
-
 all: install
 
-define BIN_template
-$(BIN_DIR)/openwrt-wrt54g-$(1).bin: $(BIN_DIR)/openwrt-brcm-2.4-$(patsubst jffs2,jffs2-4MB,$(1)).trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $$< -o $$@ -g
-       $(SED) "1s,^W54S,W54G," $$@
-       
-$(BIN_DIR)/openwrt-wrt54gs-$(1).bin: $(BIN_DIR)/openwrt-brcm-2.4-$(patsubst jffs2,jffs2-8MB,$(1)).trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $$< -o $$@ -g
-       
-ifeq ($(BR2_TARGET_WRT54G),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-wrt54g-$(1).bin
-endif
-ifeq ($(BR2_TARGET_WRT54GS),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-wrt54gs-$(1).bin
-endif
-
-
-$(BIN_DIR)/openwrt-motorola-$(1).bin: $(BIN_DIR)/openwrt-brcm-2.4-$(patsubst jffs2,jffs2-8MB,$(1)).trx
-       PATH=$(TARGET_PATH) motorola-bin $$< $$@
-
-ifeq ($(BR2_TARGET_MOTOROLA),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
-endif
-endef
-
-TARGET_DIRS:=
-TARGET_FS:=
-IMAGE_TARGETS:=
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-TARGET_DIRS += jffs2
-TARGET_FS += jffs2
-endif
-ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS_LZMA)),y)
-TARGET_DIRS += squashfs-lzma
-TARGET_FS += squashfs
-endif
-$(foreach fs,$(TARGET_FS),$(eval $(call BIN_template,$(fs))))
-
-INSTALL_TARGET_DIRS:=$(patsubst %,%-install,$(TARGET_DIRS))
-$(INSTALL_TARGET_DIRS): image_clean $(TARGET_DIR)/etc/sysconf $(BIN_DIR)
-
-prepare: $(patsubst %,%-prepare,$(TARGET_DIRS)) $(TARGET_DIR)
-
-$(TARGET_DIR):
-       mkdir -p $(TARGET_DIR)
-       if [ -f "$(TARGET_SKELETON)" ] ; then \
-       zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
-       fi;
-       if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
-               cp -a $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
-       fi;
-       mkdir -p $(TARGET_DIR)/jffs
-       mkdir -p $(TARGET_DIR)/dev
-       mkdir -p $(TARGET_DIR)/proc
-       mkdir -p $(TARGET_DIR)/tmp
-       mkdir -p $(TARGET_DIR)/lib
-       mkdir -p $(TARGET_DIR)/usr/lib
-       mkdir -p $(TARGET_DIR)/usr/bin
-       ln -sf /tmp/resolv.conf $(TARGET_DIR)/etc/resolv.conf
-       rm -rf $(TARGET_DIR)/var
-       ln -sf /tmp $(TARGET_DIR)/var
-       -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-       -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
-
 $(BIN_DIR):
        mkdir -p $(BIN_DIR)
 
-$(INSTALL_TARGET_DIRS): lzma-loader-compile linux-install
-$(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS) linux)
-compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader utils linux)
-install: utils-install lzma-install $(patsubst %,%-install,$(TARGET_DIRS) linux) $(IMAGE_TARGETS)
-clean: $(patsubst %,%-clean,$(TARGET_DIRS) linux) image_clean
+linux-compile: utils-install lzma-install
+linux-install: $(BIN_DIR)
+
+prepare: 
+compile: linux-compile
+install: image_clean linux-install
+clean: linux-clean utils-clean lzma-clean image_clean
 
 image_clean:
        rm -f $(BIN_DIR)/openwrt-*
 
-$(TARGET_DIR)/etc/sysconf:
-       mkdir -p $(TARGET_DIR)/etc
-       -grep \^BR2_SYSCONF $(TOPDIR)/.config > $(TARGET_DIR)/etc/sysconf
-
 %-clean:
+       @$(TRACE) target/$(patsubst %-clean,%,$@)/clean
        $(MAKE) -C $(patsubst %-clean,%,$@) clean
 %-prepare:
+       @$(TRACE) target/$(patsubst %-prepare,%,$@)/prepare
        $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 %-compile: %-prepare
+       @$(TRACE) target/$(patsubst %-compile,%,$@)/compile
        $(MAKE) -C $(patsubst %-compile,%,$@) compile
 %-rebuild: 
+       @$(TRACE) target/$(patsubst %-rebuild,%,$@)/rebuild
        $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild
 %-install: %-compile
+       @$(TRACE) target/$(patsubst %-install,%,$@)/install
        $(MAKE) -C $(patsubst %-install,%,$@) install
-
+linux-imagebuilder:
+       @$(TRACE) target/linux/imagebuilder
+       $(MAKE) -C linux imagebuilder