diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-01 21:42:43 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-04-01 21:42:43 +0000 |
| commit | ceb785d8486f30af2f49c35c0dc034fd07d4dc70 (patch) | |
| tree | 80b93e9ad65979251fec95b65d462b837d42a896 /rules | |
| parent | 0b523fe3d9bda345919ddfbd4128b5e4928db12e (diff) | |
| download | ptxdist-ceb785d8486f30af2f49c35c0dc034fd07d4dc70.tar.gz ptxdist-ceb785d8486f30af2f49c35c0dc034fd07d4dc70.tar.xz | |
Provide a choice to select squashfs{3.4,4.0}
linux-2.6.29 now includes squashfs 4.0 in the main line.
It is incompatible with the previous version squashfs3.4
Select 4.0 if you are using linux-2.6.29 or later
Otherwise select the version that matches the squashfs patch you've
applied to your linux kernel tree.
You no longer need to specify the endianess on squashfs4.0
Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10200 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/host-squashfs-tools.make | 3 | ||||
| -rw-r--r-- | rules/post/images.make | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make index 7c11456db..781f07c75 100644 --- a/rules/host-squashfs-tools.make +++ b/rules/host-squashfs-tools.make @@ -16,7 +16,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_SQUASHFS_TOOLS) += host-squashfs-tools # # Paths and names # -HOST_SQUASHFS_TOOLS_VERSION := 3.4 +HOST_SQUASHFS_TOOLS_VERSION := $(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_V3X, 3.4, 4.0) + HOST_SQUASHFS_TOOLS := squashfs$(HOST_SQUASHFS_TOOLS_VERSION) HOST_SQUASHFS_TOOLS_SUFFIX := tar.gz HOST_SQUASHFS_TOOLS_URL := $(PTXCONF_SETUP_SFMIRROR)/squashfs/$(HOST_SQUASHFS_TOOLS).$(HOST_SQUASHFS_TOOLS_SUFFIX) diff --git a/rules/post/images.make b/rules/post/images.make index d3b4dee38..5e4630ff4 100644 --- a/rules/post/images.make +++ b/rules/post/images.make @@ -121,6 +121,10 @@ $(IMAGEDIR)/root.jffs2: $(STATEDIR)/image_working_dir $(STATEDIR)/host-mtd-utils # # create the squashfs image # +IMAGE_SQUASHFS_EXTRA_ARGS:= \ + $(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_V3X, $(call ptx/ifdef, PTXCONF_ENDIAN_BIG, -be, -le), ) \ + $(PTXCONF_IMAGE_SQUASHFS_EXTRA_ARGS) + $(IMAGEDIR)/root.squashfs: $(STATEDIR)/image_working_dir $(STATEDIR)/host-squashfs-tools.install @echo -n "Creating root.squashfs from working dir..." @cd $(WORKDIR); \ @@ -131,8 +135,7 @@ $(IMAGEDIR)/root.squashfs: $(STATEDIR)/image_working_dir $(STATEDIR)/host-squash echo -n "$@ "; \ echo -n "-noappend "; \ echo -n "-b $(PTXCONF_IMAGE_SQUASHFS_BLOCK_SIZE) "; \ - echo -n "$(call ptx/ifdef, PTXCONF_ENDIAN_BIG, -be, -le) "; \ - echo -n $(PTXCONF_IMAGE_SQUASHFS_EXTRA_ARGS) ) \ + echo -n $(IMAGE_SQUASHFS_EXTRA_ARGS) ) \ ) | $(FAKEROOT) -- @echo "done." |