From d1a3f749982bc1a152551724c50f02a194219fe4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 8 Jun 2014 10:00:58 +0200 Subject: be consistent, do not use - in rootfs names --- mk/rootfs.mk | 4 ++-- target/aarch64/Makefile | 4 ++-- target/arm/Makefile | 8 ++++---- target/config/Config.in.target | 2 +- target/microblaze/Makefile | 8 ++++---- target/mips/Makefile | 8 ++++---- target/mips64/Makefile | 4 ++-- target/ppc/Makefile | 8 ++++---- target/ppc64/Makefile | 8 ++++---- target/sh/Makefile | 8 ++++---- target/sparc/Makefile | 8 ++++---- target/sparc64/Makefile | 8 ++++---- target/x86/Makefile | 8 ++++---- target/x86_64/Makefile | 8 ++++---- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 29b2a9d60..d2ae88320 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -49,8 +49,8 @@ endif $(eval $(call rootfs_template,usb,USB,$(USB))) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) $(eval $(call rootfs_template,initramfs,INITRAMFS,rootfstype=tmpfs)) -$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK,rootfstype=tmpfs)) -$(eval $(call rootfs_template,initramfs-archive,INITRAMFS_ARCHIVE,rootfstype=tmpfs)) +$(eval $(call rootfs_template,initramfspiggyback,INITRAMFSPIGGYBACK,rootfstype=tmpfs)) +$(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE,rootfstype=tmpfs)) $(eval $(call rootfs_template,squashfs,SQUASHFS,$(MTDDEV) rootfstype=squashfs)) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2)) diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile index 1de454020..a25488620 100644 --- a/target/aarch64/Makefile +++ b/target/aarch64/Makefile @@ -19,7 +19,7 @@ targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_SYSTEM_ARM_FM),y) @@ -47,6 +47,6 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif diff --git a/target/arm/Makefile b/target/arm/Makefile index 71c8293c4..85bf102e1 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -64,12 +64,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -102,10 +102,10 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif ifeq ($(ADK_TARGET_FS),nfsroot) diff --git a/target/config/Config.in.target b/target/config/Config.in.target index 449886160..247dee8de 100644 --- a/target/config/Config.in.target +++ b/target/config/Config.in.target @@ -85,7 +85,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS help create an read-only initramfs system. -config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK +config ADK_TARGET_ROOTFS_INITRAMFSPIGGYBACK boolean "initramfs filesystem included into kernel image" select ADK_LINUX_INITRAMFS_BUILTIN depends on \ diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index bda87da84..59851392e 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -27,12 +27,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -73,10 +73,10 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif ifeq ($(ADK_TARGET_FS),squashfs) diff --git a/target/mips/Makefile b/target/mips/Makefile index 25b77ee39..207439009 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -42,12 +42,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -86,10 +86,10 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif ifeq ($(ADK_TARGET_FS),nfsroot) diff --git a/target/mips64/Makefile b/target/mips64/Makefile index 237c8d75a..4d0b845ce 100644 --- a/target/mips64/Makefile +++ b/target/mips64/Makefile @@ -72,7 +72,7 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -101,7 +101,7 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif ifeq ($(ADK_TARGET_FS),usb) diff --git a/target/ppc/Makefile b/target/ppc/Makefile index a43b57114..d4b01e103 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -35,12 +35,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -63,9 +63,9 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 27bc62e12..2dce2806c 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -34,12 +34,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -62,9 +62,9 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif diff --git a/target/sh/Makefile b/target/sh/Makefile index 581ddf6dc..a41052675 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -39,12 +39,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -67,9 +67,9 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif diff --git a/target/sparc/Makefile b/target/sparc/Makefile index c8fed4d87..933c84aa9 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -33,12 +33,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -61,9 +61,9 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index ee0b10dad..47ba9c0b6 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -39,12 +39,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -67,9 +67,9 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif diff --git a/target/x86/Makefile b/target/x86/Makefile index 7fdd3a0cd..374186b0d 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -58,12 +58,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -100,10 +100,10 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif ifeq (${ADK_TARGET_FS},iso) diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 89de6fe04..473a05d47 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -58,12 +58,12 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @@ -100,10 +100,10 @@ endif ifeq ($(ADK_TARGET_FS),initramfs) imageinstall: kernel-install $(FW_DIR)/$(INITRAMFS) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-archive) +ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif -ifeq ($(ADK_TARGET_FS),initramfs-piggyback) +ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif ifeq (${ADK_TARGET_FS},iso) -- cgit v1.2.3