From 76ed58d705e7f3892a1259abcd92882a527e7b53 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 28 May 2005 09:17:29 +0000 Subject: move package/linux into target/linux, use wbx' new kernel code. support building images with more than one kernel, split kernel module parts off of packages that use their own kernel modules (fuse, shfs, openswan). some cleanup in the image building process in target/. image builder is disabled for now, needs some fixing. git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1085 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/squashfs-lzma/Makefile | 40 +++++++++++++++----- target/squashfs-lzma/patches/100-lzma.patch | 22 +++++++++++ target/squashfs-lzma/squashfs2.0-tools-lzma.patch | 22 ----------- target/squashfs-lzma/squashfslzmaroot.mk | 46 ----------------------- 4 files changed, 52 insertions(+), 78 deletions(-) create mode 100644 target/squashfs-lzma/patches/100-lzma.patch delete mode 100644 target/squashfs-lzma/squashfs2.0-tools-lzma.patch delete mode 100644 target/squashfs-lzma/squashfslzmaroot.mk (limited to 'target/squashfs-lzma') diff --git a/target/squashfs-lzma/Makefile b/target/squashfs-lzma/Makefile index 2664ed7e2..3a61d0623 100644 --- a/target/squashfs-lzma/Makefile +++ b/target/squashfs-lzma/Makefile @@ -1,16 +1,36 @@ include $(TOPDIR)/rules.mk -include ./squashfslzmaroot.mk -SQUASHFS_TARGETS:=$(BIN_DIR)/openwrt-generic-squashfs.trx +SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs2.1-r2 +SQUASHFSLZMA_SOURCE=squashfs2.1-r2.tar.gz +SQUASHFSLZMA_SITE=@SF/squashfs +SQUASHFSLZMA_MD5SUM=ffa24eff13b2ca51ed6990d15237e4c1 +$(DL_DIR)/$(SQUASHFSLZMA_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) $(SQUASHFSLZMA_MD5SUM) $(SQUASHFSLZMA_SITE) + +$(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) + zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf - + $(PATCH) $(SQUASHFSLZMA_DIR) ./patches + touch $(SQUASHFSLZMA_DIR)/.unpacked + +$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked + $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma + +$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma + cp $< $@ + +source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) prepare: $(SQUASHFSLZMA_DIR)/.unpacked -compile: squashfslzma -install: $(SQUASHFS_TARGETS) -clean: squashfslzmaroot-dirclean +compile: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma +install: +clean: + rm -rf $(SQUASHFSLZMA_DIR) -$(BIN_DIR)/openwrt-generic-squashfs.trx: - @mkdir -p $(TARGET_DIR)/jffs - PATH=$(TARGET_PATH) mksquashfs-lzma $(TARGET_DIR) $(IMAGE).squashfslzma -noappend -root-owned -le +FILESYSTEMS:=squashfs +define squashfs_template + @mkdir -p $(1)/root/jffs + PATH=$(TARGET_PATH) mksquashfs-lzma $(1)/root $(1)/root.squashfs -noappend -root-owned -le PATH=$(TARGET_PATH) trx -o $@ $(BUILD_DIR)/loader.gz \ - $(LINUX_IMAGE) $(IMAGE).squashfslzma - + $(1)/kernel-image $(1)/root.squashfs +endef +include ../image.mk diff --git a/target/squashfs-lzma/patches/100-lzma.patch b/target/squashfs-lzma/patches/100-lzma.patch new file mode 100644 index 000000000..324f8d822 --- /dev/null +++ b/target/squashfs-lzma/patches/100-lzma.patch @@ -0,0 +1,22 @@ +--- squashfs2.0/squashfs-tools/Makefile 2004-04-30 19:29:35.000000000 +0400 ++++ squashfs-tools/Makefile 2005-01-20 14:57:53.423668596 +0300 +@@ -1,12 +1,18 @@ + INCLUDEDIR = . ++#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib + + CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 + + mksquashfs: mksquashfs.o read_fs.o sort.o + $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@ + ++mksquashfs-lzma: mksquashfs.o read_fs.o sort.o ++ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@ ++ + mksquashfs.o: mksquashfs.c mksquashfs.h + + read_fs.o: read_fs.c read_fs.h + + sort.o: sort.c ++ ++clean: ++ rm -f *.o mksquashfs mksquashfs-lzma diff --git a/target/squashfs-lzma/squashfs2.0-tools-lzma.patch b/target/squashfs-lzma/squashfs2.0-tools-lzma.patch deleted file mode 100644 index 324f8d822..000000000 --- a/target/squashfs-lzma/squashfs2.0-tools-lzma.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- squashfs2.0/squashfs-tools/Makefile 2004-04-30 19:29:35.000000000 +0400 -+++ squashfs-tools/Makefile 2005-01-20 14:57:53.423668596 +0300 -@@ -1,12 +1,18 @@ - INCLUDEDIR = . -+#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib - - CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 - - mksquashfs: mksquashfs.o read_fs.o sort.o - $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@ - -+mksquashfs-lzma: mksquashfs.o read_fs.o sort.o -+ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@ -+ - mksquashfs.o: mksquashfs.c mksquashfs.h - - read_fs.o: read_fs.c read_fs.h - - sort.o: sort.c -+ -+clean: -+ rm -f *.o mksquashfs mksquashfs-lzma diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk deleted file mode 100644 index bd90cd489..000000000 --- a/target/squashfs-lzma/squashfslzmaroot.mk +++ /dev/null @@ -1,46 +0,0 @@ -############################################################# -# -# squashfs target -# -############################################################# - -SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs2.1-r2 -SQUASHFSLZMA_SOURCE=squashfs2.1-r2.tar.gz -SQUASHFSLZMA_SITE=@SF/squashfs -SQUASHFSLZMA_MD5SUM=ffa24eff13b2ca51ed6990d15237e4c1 - -$(DL_DIR)/$(SQUASHFSLZMA_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) $(SQUASHFSLZMA_MD5SUM) $(SQUASHFSLZMA_SITE) - -$(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) - zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf - - patch -d $(SQUASHFSLZMA_DIR) -p1 < squashfs2.0-tools-lzma.patch - touch $(SQUASHFSLZMA_DIR)/.unpacked - -$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked - $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma - -$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma - cp $< $@ - -squashfslzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma - -squashfslzma-source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) - -squashfslzma-clean: - -$(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools clean - -squashfslzma-dirclean: - rm -rf $(SQUASHFSLZMA_DIR) - - -############################################################# -# -# Build the squashfs root filesystem image -# -############################################################# - -squashfslzmaroot-source: squashfslzma-source - -squashfslzmaroot-dirclean: - rm -rf $(SQUASHFSLZMA_DIR) -- cgit v1.2.3