From 90f603e2be40d996c421ae8e95464e38911eabaf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Jun 2014 07:41:41 +0200 Subject: s/TOPDIR/ADK_TOPDIR/ to avoid namespace collisions in some packages, rename TOPDIR. Sorry you need to make cleandir && make prereq && make --- target/Makefile | 14 +++++++------- target/aarch64/Makefile | 14 +++++++------- target/arm/Makefile | 10 +++++----- target/m68k/Makefile | 14 +++++++------- target/microblaze/Makefile | 10 +++++----- target/mips/Makefile | 10 +++++----- target/mips64/Makefile | 10 +++++----- target/ppc/Makefile | 10 +++++----- target/ppc64/Makefile | 10 +++++----- target/sh/Makefile | 10 +++++----- target/sparc/Makefile | 10 +++++----- target/sparc64/Makefile | 10 +++++----- target/x86/Makefile | 10 +++++----- target/x86_64/Makefile | 10 +++++----- target/xtensa/Makefile | 10 +++++----- target/xtensa/target.mk | 2 +- 16 files changed, 82 insertions(+), 82 deletions(-) (limited to 'target') diff --git a/target/Makefile b/target/Makefile index 1ac375b62..d245f1a70 100644 --- a/target/Makefile +++ b/target/Makefile @@ -1,8 +1,8 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/rootfs.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/rootfs.mk all: install @@ -26,11 +26,11 @@ ADK_PACKAGE_CRYPTINIT_SWAP:=$(strip $(subst ",, $(ADK_PACKAGE_CRYPTINIT_SWAP))) ADK_PACKAGE_CMDLINE:=root=$(ADK_PACKAGE_CRYPTINIT_ROOT) swap=$(ADK_PACKAGE_CRYPTINIT_SWAP) resume=/dev/mapper/swapcrypt ifeq (${ADK_TARGET_KERNEL_CUSTOMISING},y) -config-prepare: $(TOPDIR)/.config - @sed -n '/^ADK_KERNEL/s//CONFIG/p' ${TOPDIR}/.config \ +config-prepare: $(ADK_TOPDIR)/.config + @sed -n '/^ADK_KERNEL/s//CONFIG/p' ${ADK_TOPDIR}/.config \ >${BUILD_DIR}/.kernelconfig.kernel @if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \ - cat ${TOPDIR}/target/linux/kernel.config \ + cat ${ADK_TOPDIR}/target/linux/kernel.config \ ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \ else \ echo "no miniconfig found for target system"; \ @@ -76,9 +76,9 @@ endif cp .kernelconfig.tmp .kernelconfig @-rm -f ${BUILD_DIR}/.kernelconfig.tmp else -config-prepare: $(TOPDIR)/.config +config-prepare: $(ADK_TOPDIR)/.config @if [ -f ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} ];then \ - cat ${TOPDIR}/target/linux/kernel.config \ + cat ${ADK_TOPDIR}/target/linux/kernel.config \ ${ADK_TARGET_ARCH}/kernel/${ADK_TARGET_KERNEL_MINICONFIG} > ${BUILD_DIR}/.kernelconfig.board; \ else \ echo "no miniconfig found for target system"; \ diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile index a25488620..3c04d544a 100644 --- a/target/aarch64/Makefile +++ b/target/aarch64/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=${LINUX_DIR}/arch/arm64/boot/Image @@ -31,10 +31,10 @@ endif kernel-strip: kernel-install: kernel-strip - cd $(TOPDIR) && \ + cd $(ADK_TOPDIR) && \ make -f Makefile \ -C package/boot-wrapper-aarch64 clean - cd $(TOPDIR) && \ + cd $(ADK_TOPDIR) && \ make -f Makefile \ -C package/boot-wrapper-aarch64 package ${CP} ${LINUX_DIR}/linux-system.axf \ diff --git a/target/arm/Makefile b/target/arm/Makefile index 85bf102e1..3213212bc 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) ifeq ($(ADK_TARGET_KERNEL_ZIMAGE),y) diff --git a/target/m68k/Makefile b/target/m68k/Makefile index 0827ee0f0..bc48f9890 100644 --- a/target/m68k/Makefile +++ b/target/m68k/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux.gz @@ -17,8 +17,8 @@ targethelp: ifeq ($(ADK_TARGET_SYSTEM_ARANYM_M68K),y) @sed -e "s#@@KERNEL@@#$(FW_DIR)/$(TARGET_KERNEL)#" \ -e "s#@@INITRAMFS@@#${FW_DIR}/${INITRAMFS}#" \ - $(TOPDIR)/target/m68k/aranym.cfg.in \ - > $(TOPDIR)/target/m68k/aranym.cfg + $(ADK_TOPDIR)/target/m68k/aranym.cfg.in \ + > $(ADK_TOPDIR)/target/m68k/aranym.cfg @echo 'Start aranym with: aranym-mmu -l -c target/m68k/aranym.cfg' @echo 'Ungrab mouse with middle mouse click' endif diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 59851392e..d4884ae0d 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/microblaze/boot/$(ADK_TARGET_KERNEL) diff --git a/target/mips/Makefile b/target/mips/Makefile index 207439009..df15c79af 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id diff --git a/target/mips64/Makefile b/target/mips64/Makefile index 4d0b845ce..5ea35f274 100644 --- a/target/mips64/Makefile +++ b/target/mips64/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id diff --git a/target/ppc/Makefile b/target/ppc/Makefile index d4b01e103..3268dbc6e 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 2dce2806c..a554f994d 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id diff --git a/target/sh/Makefile b/target/sh/Makefile index a41052675..27cc9696f 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage diff --git a/target/sparc/Makefile b/target/sparc/Makefile index 933c84aa9..e166d7426 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/sparc/boot/zImage diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 47ba9c0b6..1c0aa5f49 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/vmlinux diff --git a/target/x86/Makefile b/target/x86/Makefile index b6e9c2bcc..532896813 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 473a05d47..d2a39a4ff 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile index 9aecd3403..006cd778f 100644 --- a/target/xtensa/Makefile +++ b/target/xtensa/Makefile @@ -1,11 +1,11 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk -include $(TOPDIR)/mk/kernel.mk -include $(TOPDIR)/mk/modules.mk -include $(TOPDIR)/mk/kernel-build.mk -include $(TOPDIR)/mk/image.mk +include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel.mk +include $(ADK_TOPDIR)/mk/modules.mk +include $(ADK_TOPDIR)/mk/kernel-build.mk +include $(ADK_TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf diff --git a/target/xtensa/target.mk b/target/xtensa/target.mk index 709b5aa5e..550b95557 100644 --- a/target/xtensa/target.mk +++ b/target/xtensa/target.mk @@ -1,4 +1,4 @@ -include $(TOPDIR)/mk/kernel-ver.mk +include $(ADK_TOPDIR)/mk/kernel-ver.mk ARCH:= xtensa CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -- cgit v1.2.3