diff options
| -rw-r--r-- | Config.in | 8 | ||||
| -rw-r--r-- | include/image.mk | 10 | ||||
| -rwxr-xr-x | scripts/metadata.pl | 2 | ||||
| -rw-r--r-- | target/Config.in | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/cobalt/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ep93xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/kirkwood/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/mpc52xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/mpc83xx/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/rb532/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/x86/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/xburst/Makefile | 2 |
13 files changed, 20 insertions, 20 deletions
@@ -60,14 +60,14 @@ menu "Target Images" help Build a squashfs-lzma root filesystem - config TARGET_ROOTFS_TGZ - bool "tgz" - default y if USES_TGZ + config TARGET_ROOTFS_TARGZ + bool "tar.gz" + default y if USES_TARGZ help Build a compressed tar archive of the the root filesystem config TARGET_ROOTFS_CPIOGZ - bool "cpiogz" + bool "cpio.gz" default y if USES_CPIOGZ help Build a compressed cpio archive of the the root filesystem diff --git a/include/image.mk b/include/image.mk index 8dc7e114b..22ab176cb 100644 --- a/include/image.mk +++ b/include/image.mk @@ -125,9 +125,9 @@ ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y) endef endif -ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) - define Image/mkfs/tgz - $(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tgz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . +ifeq ($(CONFIG_TARGET_ROOTFS_TARGZ),y) + define Image/mkfs/targz + $(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ . endef endif @@ -176,7 +176,7 @@ ifneq ($(IB),1) $(call Image/BuildKernel) $(call Image/mkfs/jffs2) $(call Image/mkfs/squashfs) - $(call Image/mkfs/tgz) + $(call Image/mkfs/targz) $(call Image/mkfs/cpiogz) $(call Image/mkfs/ext2) $(call Image/mkfs/iso) @@ -187,7 +187,7 @@ else $(call Image/BuildKernel) $(call Image/mkfs/jffs2) $(call Image/mkfs/squashfs) - $(call Image/mkfs/tgz) + $(call Image/mkfs/targz) $(call Image/mkfs/cpiogz) $(call Image/mkfs/ext2) $(call Image/mkfs/iso) diff --git a/scripts/metadata.pl b/scripts/metadata.pl index e0fb32fc1..2d12e1929 100755 --- a/scripts/metadata.pl +++ b/scripts/metadata.pl @@ -162,7 +162,7 @@ sub target_config_features(@) { /squashfs/ and $ret .= "\tselect USES_SQUASHFS\n"; /jffs2/ and $ret .= "\tselect USES_JFFS2\n"; /ext2/ and $ret .= "\tselect USES_EXT2\n"; - /tgz/ and $ret .= "\tselect USES_TGZ\n"; + /targz/ and $ret .= "\tselect USES_TARGZ\n"; /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n"; /ubifs/ and $ret .= "\tselect USES_UBIFS\n"; /fpu/ and $ret .= "\tselect HAS_FPU\n"; diff --git a/target/Config.in b/target/Config.in index f881245c6..48fd82732 100644 --- a/target/Config.in +++ b/target/Config.in @@ -49,7 +49,7 @@ config USES_JFFS2 config USES_EXT2 bool -config USES_TGZ +config USES_TARGZ bool config USES_CPIOGZ diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index 9c7e605cd..540fe51d1 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=mips BOARD:=ar71xx BOARDNAME:=Atheros AR71xx/AR7240/AR913x -FEATURES:=squashfs jffs2 tgz +FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time LINUX_VERSION:=2.6.32.12 diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile index 69705e911..806a60df4 100644 --- a/target/linux/cobalt/Makefile +++ b/target/linux/cobalt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=cobalt BOARDNAME:=Cobalt Microservers -FEATURES:=tgz pci ext2 +FEATURES:=targz pci ext2 CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time LINUX_VERSION:=2.6.32.12 diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile index dae98ad7c..8e469d4b3 100644 --- a/target/linux/ep93xx/Makefile +++ b/target/linux/ep93xx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=ep93xx BOARDNAME:=Cirrus Logic EP93xx SoC -FEATURES:=squashfs jffs2 ext2 tgz usb +FEATURES:=squashfs jffs2 ext2 targz usb CFLAGS:=-Os -pipe -march=armv4t -funit-at-a-time LINUX_VERSION:=2.6.30.10 diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile index a1e9e5f57..13f38af45 100644 --- a/target/linux/kirkwood/Makefile +++ b/target/linux/kirkwood/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=kirkwood BOARDNAME:=Marvell Kirkwood -FEATURES:=tgz usb +FEATURES:=targz usb LINUX_VERSION:=2.6.30.10 diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile index 8e2a8cdaa..ee9fa6c09 100644 --- a/target/linux/mpc52xx/Makefile +++ b/target/linux/mpc52xx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=powerpc BOARD:=mpc52xx BOARDNAME:=Freescale MPC52xx -FEATURES:=tgz ext2 +FEATURES:=targz ext2 LINUX_VERSION:=2.6.30.10 diff --git a/target/linux/mpc83xx/Makefile b/target/linux/mpc83xx/Makefile index 5598b5b11..9fa36d4cf 100644 --- a/target/linux/mpc83xx/Makefile +++ b/target/linux/mpc83xx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=powerpc BOARD:=mpc83xx BOARDNAME:=Freescale MPC83xx -FEATURES:=squashfs tgz broken +FEATURES:=squashfs targz broken LINUX_VERSION:=2.6.31.12 diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index b4253833b..ed9271584 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 -FEATURES:=jffs2 pci tgz +FEATURES:=jffs2 pci targz LINUX_VERSION:=2.6.32.12 diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 666291238..6e7679570 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=i386 BOARD:=x86 BOARDNAME:=x86 -FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz +FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 LINUX_VERSION:=2.6.32.12 diff --git a/target/linux/xburst/Makefile b/target/linux/xburst/Makefile index 7925c49db..138197290 100644 --- a/target/linux/xburst/Makefile +++ b/target/linux/xburst/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk ARCH:=mipsel BOARD:=xburst BOARDNAME:=Ingenic XBurst -FEATURES:=jffs2 tgz ubifs audio +FEATURES:=jffs2 targz ubifs audio SUBTARGETS:=qi_lb60 n516 n526 LINUX_VERSION:=2.6.32.12 |