i am to lame for make, both targets can be build again

SVN-Revision: 240
master
Waldemar Brodkorb 20 years ago
parent 034524f5d0
commit 59166f4123
  1. 2
      openwrt/target/jffs2/Makefile.in
  2. 13
      openwrt/target/jffs2/jffs2root.mk
  3. 18
      openwrt/target/squashfs/squashfsroot.mk

@ -1,3 +1,3 @@
ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
TARGETS+=jffs2root
TARGETS+=jffs2root openwrt-image
endif

@ -35,8 +35,7 @@ jffs2root: mtd
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/info
$(MKFS_JFFS2) --pad --little-endian --squash -e 0x20000 \
-D target/default/device_table.txt -d $(TARGET_DIR) \
-o $(IMAGE).jffs2
-d $(TARGET_DIR) -o $(IMAGE).jffs2
jffs2root-source: $(DL_DIR)/$(MTD_SOURCE)
@ -46,5 +45,15 @@ jffs2root-clean:
jffs2root-dirclean:
rm -rf $(MTD_DIR)
openwrt-linux.trx.jffs2:
$(BUILD_DIR)/trx -o openwrt-linux.trx.jffs2 $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).jffs2
openwrt-gs-code.bin.jffs2: openwrt-linux.trx.jffs2
$(BUILD_DIR)/addpattern -2 -i openwrt-linux.trx.jffs2 -o openwrt-gs-code.bin.jffs2 -g
openwrt-g-code.bin.jffs2: openwrt-gs-code.bin.jffs2
sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.jffs2 > openwrt-g-code.bin.jffs2
openwrt-image: openwrt-g-code.bin.jffs2

@ -4,8 +4,6 @@
#
#############################################################
ROOTFSTYPE=squashfs
SQUASHFS_DIR=$(BUILD_DIR)/squashfs2.1-r2
SQUASHFS_SOURCE=squashfs2.1-r2.tar.gz
SQUASHFS_SITE=http://dl.sourceforge.net/sourceforge/squashfs
@ -40,7 +38,7 @@ squashfs-dirclean:
squashfsroot: squashfs
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/info
$(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).$(ROOTFSTYPE) -noappend -root-owned -le
$(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR) $(IMAGE).squashfs -noappend -root-owned -le
squashfsroot-source: squashfs-source
@ -50,13 +48,13 @@ squashfsroot-clean:
squashfsroot-dirclean:
rm -rf $(SQUASHFS_DIR)
openwrt-linux.trx.$(ROOTFSTYPE):
$(BUILD_DIR)/trx -o openwrt-linux.trx.$(ROOTFSTYPE) $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).$(ROOTFSTYPE)
openwrt-linux.trx.squashfs:
$(BUILD_DIR)/trx -o openwrt-linux.trx.squashfs $(LINUX_DIR)/$(LINUX_BINLOC) $(IMAGE).squashfs
openwrt-gs-code.bin.$(ROOTFSTYPE): openwrt-linux.trx.$(ROOTFSTYPE)
$(BUILD_DIR)/addpattern -2 -i openwrt-linux.trx.$(ROOTFSTYPE) -o openwrt-gs-code.bin.$(ROOTFSTYPE) -g
openwrt-gs-code.bin.squashfs: openwrt-linux.trx.squashfs
$(BUILD_DIR)/addpattern -2 -i openwrt-linux.trx.squashfs -o openwrt-gs-code.bin.squashfs -g
openwrt-g-code.bin.$(ROOTFSTYPE): openwrt-gs-code.bin.$(ROOTFSTYPE)
sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.$(ROOTFSTYPE) > openwrt-g-code.bin.$(ROOTFSTYPE)
openwrt-g-code.bin.squashfs: openwrt-gs-code.bin.squashfs
sed -e "1s,^W54S,W54G," < openwrt-gs-code.bin.squashfs > openwrt-g-code.bin.squashfs
openwrt-image: openwrt-g-code.bin.$(ROOTFSTYPE)
openwrt-image: openwrt-g-code.bin.squashfs

Loading…
Cancel
Save