projects
/
openwrt
/
staging
/
rmilecki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7992df3
)
buildsystem: rename tgz/TGZ "feature" and matching options to targz/TARGZ
author
Nicolas Thill
<nico@openwrt.org>
Wed, 28 Apr 2010 14:47:43 +0000
(14:47 +0000)
committer
Nicolas Thill
<nico@openwrt.org>
Wed, 28 Apr 2010 14:47:43 +0000
(14:47 +0000)
SVN-Revision: 21238
13 files changed:
Config.in
patch
|
blob
|
history
include/image.mk
patch
|
blob
|
history
scripts/metadata.pl
patch
|
blob
|
history
target/Config.in
patch
|
blob
|
history
target/linux/ar71xx/Makefile
patch
|
blob
|
history
target/linux/cobalt/Makefile
patch
|
blob
|
history
target/linux/ep93xx/Makefile
patch
|
blob
|
history
target/linux/kirkwood/Makefile
patch
|
blob
|
history
target/linux/mpc52xx/Makefile
patch
|
blob
|
history
target/linux/mpc83xx/Makefile
patch
|
blob
|
history
target/linux/rb532/Makefile
patch
|
blob
|
history
target/linux/x86/Makefile
patch
|
blob
|
history
target/linux/xburst/Makefile
patch
|
blob
|
history
diff --git
a/Config.in
b/Config.in
index 4746ba418599e06c7b4d552e3bfd4387336c4cdf..e07d803ebdadd8da49948a9d62fe4f0bfc460ab5 100644
(file)
--- a/
Config.in
+++ b/
Config.in
@@
-60,14
+60,14
@@
menu "Target Images"
help
Build a squashfs-lzma root filesystem
help
Build a squashfs-lzma root filesystem
- config TARGET_ROOTFS_TGZ
- bool "tgz"
- default y if USES_TGZ
+ config TARGET_ROOTFS_T
AR
GZ
+ bool "t
ar.
gz"
+ default y if USES_T
AR
GZ
help
Build a compressed tar archive of the the root filesystem
config TARGET_ROOTFS_CPIOGZ
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
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 8dc7e114b695958cc2289cfcbaad00a5b482f5ed..22ab176cb9af0c79899a430f302c80e82bbbeb5b 100644
(file)
--- a/
include/image.mk
+++ b/
include/image.mk
@@
-125,9
+125,9
@@
ifeq ($(CONFIG_TARGET_ROOTFS_CPIOGZ),y)
endef
endif
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_T
AR
GZ),y)
+ define Image/mkfs/t
ar
gz
+ $(TAR) -zcf $(BIN_DIR)/$(IMG_PREFIX)-rootfs.t
ar.
gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
endef
endif
endef
endif
@@
-176,7
+176,7
@@
ifneq ($(IB),1)
$(call Image/BuildKernel)
$(call Image/mkfs/jffs2)
$(call Image/mkfs/squashfs)
$(call Image/BuildKernel)
$(call Image/mkfs/jffs2)
$(call Image/mkfs/squashfs)
- $(call Image/mkfs/tgz)
+ $(call Image/mkfs/t
ar
gz)
$(call Image/mkfs/cpiogz)
$(call Image/mkfs/ext2)
$(call Image/mkfs/iso)
$(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/BuildKernel)
$(call Image/mkfs/jffs2)
$(call Image/mkfs/squashfs)
- $(call Image/mkfs/tgz)
+ $(call Image/mkfs/t
ar
gz)
$(call Image/mkfs/cpiogz)
$(call Image/mkfs/ext2)
$(call Image/mkfs/iso)
$(call Image/mkfs/cpiogz)
$(call Image/mkfs/ext2)
$(call Image/mkfs/iso)
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index e0fb32fc1189608fadf8209fd54d64ef35dd5b25..2d12e192986ea00e57b2e4aff884ea740368c7a4 100755
(executable)
--- 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";
/squashfs/ and $ret .= "\tselect USES_SQUASHFS\n";
/jffs2/ and $ret .= "\tselect USES_JFFS2\n";
/ext2/ and $ret .= "\tselect USES_EXT2\n";
- /t
gz/ and $ret .= "\tselect USES_T
GZ\n";
+ /t
argz/ and $ret .= "\tselect USES_TAR
GZ\n";
/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
/ubifs/ and $ret .= "\tselect USES_UBIFS\n";
/fpu/ and $ret .= "\tselect HAS_FPU\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 f881245c627e862c086243b7dca5fe59de81f16c..48fd827326b35073c7bde0f94bfa8a9b216661f5 100644
(file)
--- a/
target/Config.in
+++ b/
target/Config.in
@@
-49,7
+49,7
@@
config USES_JFFS2
config USES_EXT2
bool
config USES_EXT2
bool
-config USES_TGZ
+config USES_T
AR
GZ
bool
config USES_CPIOGZ
bool
config USES_CPIOGZ
diff --git
a/target/linux/ar71xx/Makefile
b/target/linux/ar71xx/Makefile
index 9c7e605cd1772f305d308ee2904b16c6e6435a34..540fe51d1cd3b15801b4c61adbd4aeb1f7c12c97 100644
(file)
--- 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
ARCH:=mips
BOARD:=ar71xx
BOARDNAME:=Atheros AR71xx/AR7240/AR913x
-FEATURES:=squashfs jffs2 tgz
+FEATURES:=squashfs jffs2 t
ar
gz
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
LINUX_VERSION:=2.6.32.12
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 69705e9116e1a5069e1c3b40f48cf89b2c83cc3b..806a60df4e03f202e53863c7d7972c47dd8fbc26 100644
(file)
--- 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
ARCH:=mipsel
BOARD:=cobalt
BOARDNAME:=Cobalt Microservers
-FEATURES:=tgz pci ext2
+FEATURES:=t
ar
gz pci ext2
CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time
LINUX_VERSION:=2.6.32.12
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 dae98ad7cc25caae5ca4f9c7e4dae936ae62b3fa..8e469d4b3278d6bd74284fc38ae59494db1cf8ab 100644
(file)
--- 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
ARCH:=arm
BOARD:=ep93xx
BOARDNAME:=Cirrus Logic EP93xx SoC
-FEATURES:=squashfs jffs2 ext2 tgz usb
+FEATURES:=squashfs jffs2 ext2 t
ar
gz usb
CFLAGS:=-Os -pipe -march=armv4t -funit-at-a-time
LINUX_VERSION:=2.6.30.10
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 a1e9e5f57fa63fb6b3f5d050602374b3e0664376..13f38af45223c5aab82bc71066c02b3522a27b25 100644
(file)
--- 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
ARCH:=arm
BOARD:=kirkwood
BOARDNAME:=Marvell Kirkwood
-FEATURES:=tgz usb
+FEATURES:=t
ar
gz usb
LINUX_VERSION:=2.6.30.10
LINUX_VERSION:=2.6.30.10
diff --git
a/target/linux/mpc52xx/Makefile
b/target/linux/mpc52xx/Makefile
index 8e2a8cdaa603453ad13211c7f84923a791baadd7..ee9fa6c09ac9ff01219f12d995963ba80f769c79 100644
(file)
--- 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
ARCH:=powerpc
BOARD:=mpc52xx
BOARDNAME:=Freescale MPC52xx
-FEATURES:=tgz ext2
+FEATURES:=t
ar
gz ext2
LINUX_VERSION:=2.6.30.10
LINUX_VERSION:=2.6.30.10
diff --git
a/target/linux/mpc83xx/Makefile
b/target/linux/mpc83xx/Makefile
index 5598b5b117e21ed36cdb1beb3540e37baf606b87..9fa36d4cfe9ce01b5d066a49b1f8755fa3f57e6f 100644
(file)
--- 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
ARCH:=powerpc
BOARD:=mpc83xx
BOARDNAME:=Freescale MPC83xx
-FEATURES:=squashfs tgz broken
+FEATURES:=squashfs t
ar
gz broken
LINUX_VERSION:=2.6.31.12
LINUX_VERSION:=2.6.31.12
diff --git
a/target/linux/rb532/Makefile
b/target/linux/rb532/Makefile
index b4253833b2d3dd498f5ee6a3a77de175b476d431..ed927158436c981d5cc2542ad6c8e41a991838ce 100644
(file)
--- 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
ARCH:=mipsel
BOARD:=rb532
BOARDNAME:=Mikrotik RouterBoard 532
-FEATURES:=jffs2 pci tgz
+FEATURES:=jffs2 pci t
ar
gz
LINUX_VERSION:=2.6.32.12
LINUX_VERSION:=2.6.32.12
diff --git
a/target/linux/x86/Makefile
b/target/linux/x86/Makefile
index 66629123809f182c59cf96b3a67a675ac868e487..6e7679570ce216ed79e664ebaf75dba660a24043 100644
(file)
--- a/
target/linux/x86/Makefile
+++ b/
target/linux/x86/Makefile
@@
-9,7
+9,7
@@
include $(TOPDIR)/rules.mk
ARCH:=i386
BOARD:=x86
BOARDNAME:=x86
ARCH:=i386
BOARD:=x86
BOARDNAME:=x86
-FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia tgz
+FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia t
ar
gz
SUBTARGETS=generic olpc xen_domu ep80579 net5501
LINUX_VERSION:=2.6.32.12
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 7925c49db30f27fb58b463759bd49792283cf6aa..138197290026513686e9ac60b6cfe360cc3be717 100644
(file)
--- 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
ARCH:=mipsel
BOARD:=xburst
BOARDNAME:=Ingenic XBurst
-FEATURES:=jffs2 tgz ubifs audio
+FEATURES:=jffs2 t
ar
gz ubifs audio
SUBTARGETS:=qi_lb60 n516 n526
LINUX_VERSION:=2.6.32.12
SUBTARGETS:=qi_lb60 n516 n526
LINUX_VERSION:=2.6.32.12