From 48758993b09a96f83c2bd190a5586421c90428e7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Jun 2014 11:11:56 +0200 Subject: refactor CPU_ARCH/ARCH variables After Joerg asked me about the difference between ADK_TARGET_ARCH and ADK_TARGET_CPU_ARCH I recognized many duplication of variables for this information. These patch fixes this up. Use make cleandir && make menuconfig && make --- mk/buildhlp.mk | 2 +- mk/image.mk | 4 ++-- mk/kernel-build.mk | 1 + mk/kernel-vars.mk | 2 +- mk/kernel.mk | 4 ++-- mk/package.mk | 18 +++++++++--------- mk/perl.mk | 2 +- mk/pkg-bottom.mk | 18 +++++++++--------- mk/qemu.mk | 20 ++++++++++---------- mk/vars.mk | 6 +++--- 10 files changed, 39 insertions(+), 38 deletions(-) (limited to 'mk') diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index a91999826..738f5dce9 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -19,7 +19,7 @@ WRKSRC?= ${WRKDIST} # This is where configure, make and make install (fake) run from WRKBUILD?= ${WRKSRC} # This is where make install (fake) writes to -WRKINST?= ${WRKDIR}/fake-${CPU_ARCH}/root +WRKINST?= ${WRKDIR}/fake-${ADK_TARGET_CPU_ARCH}/root ifeq ($(strip ${NO_CHECKSUM}),) _CHECKSUM_COOKIE= ${WRKDIR}/.checksum_done diff --git a/mk/image.mk b/mk/image.mk index b3733c017..0f883c420 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -71,7 +71,7 @@ ifneq ($(ADK_LINUX_X86_64)$(ADK_LINUX_PPC64)$(ADK_LINUX_SPARC64)$(ADK_TARGET_ABI endif KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg -KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) +KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(ADK_TARGET_CPU_ARCH).$(PKG_SUFFIX) TARGET_KERNEL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_FS}-kernel INITRAMFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS} ROOTFSSQUASHFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img @@ -86,7 +86,7 @@ kernel-package: kernel-strip @mkdir -p $(KERNEL_PKGDIR)/boot cp $(BUILD_DIR)/$(TARGET_KERNEL) $(KERNEL_PKGDIR)/boot/kernel @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \ - ../linux/kernel.control ${KERNEL_VERSION} ${CPU_ARCH} + ../linux/kernel.control ${KERNEL_VERSION} ${ADK_TARGET_CPU_ARCH} $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE) diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 88873519d..29117f3b7 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -2,6 +2,7 @@ # material, please see the LICENCE file in the top-level directory. include $(TOPDIR)/rules.mk +include ${TOPDIR}/mk/kernel-ver.mk include $(TOPDIR)/mk/linux.mk include ${TOPDIR}/mk/kernel-vars.mk diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 8e1a6c516..a9fd2aa60 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. KERNEL_MAKE_OPTS:= V=1 \ - ARCH=$(ARCH) \ + ARCH=$(ADK_TARGET_ARCH) \ CROSS_COMPILE="$(TARGET_CROSS)" \ CC="$(TARGET_CC)" \ HOSTCC="${CC_FOR_BUILD}" \ diff --git a/mk/kernel.mk b/mk/kernel.mk index a624ad947..fd5860a99 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -30,7 +30,7 @@ define KMOD_template IDEPENDK_$(1):=kernel ($(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") -PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX) +PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(ADK_TARGET_CPU_ARCH).$(PKG_SUFFIX) I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($${ADK_TARGET_KERNEL_CUSTOMISING},y) @@ -49,7 +49,7 @@ $$(PKG_$(1)): echo "Description: kernel module $(2)" >> $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(I_$(1)) \ $(LINUX_BUILD_DIR)/kmod-control/kmod-$(2).control \ - $(KERNEL_VERSION)-$(KERNEL_RELEASE) $(CPU_ARCH) + $(KERNEL_VERSION)-$(KERNEL_RELEASE) $(ADK_TARGET_CPU_ARCH) echo "Depends: $$(IDEPENDK_$(1))" >> $$(I_$(1))/CONTROL/control ifneq ($(strip $(3)),) mkdir -p $$(I_$(1))/lib/modules/$(KERNEL_MOD_VERSION) diff --git a/mk/package.mk b/mk/package.mk index d468d6ed0..831ff0147 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -116,12 +116,12 @@ PKGNAME_$(1)= $(2) PKGDEPS_$(1)= $(4) PKGDESC_$(1)= $(5) PKGSECT_$(1)= $(6) -IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${CPU_ARCH}.${PKG_SUFFIX} -IPKG_$(1)_DEV= $(PACKAGE_DIR)/$(2)-dev_$(3)_${CPU_ARCH}.${PKG_SUFFIX} -IPKG_$(1)_DBG= $(PACKAGE_DIR)/$(2)-dbg_$(3)_${CPU_ARCH}.${PKG_SUFFIX} -IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) -IDIR_$(1)_DEV= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dev -IDIR_$(1)_DBG= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2)-dbg +IPKG_$(1)= $(PACKAGE_DIR)/$(2)_$(3)_${ADK_TARGET_CPU_ARCH}.${PKG_SUFFIX} +IPKG_$(1)_DEV= $(PACKAGE_DIR)/$(2)-dev_$(3)_${ADK_TARGET_CPU_ARCH}.${PKG_SUFFIX} +IPKG_$(1)_DBG= $(PACKAGE_DIR)/$(2)-dbg_$(3)_${ADK_TARGET_CPU_ARCH}.${PKG_SUFFIX} +IDIR_$(1)= $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(2) +IDIR_$(1)_DEV= $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(2)-dev +IDIR_$(1)_DBG= $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(2)-dbg ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) ifneq (,$(filter dev,$(7))) ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) @@ -168,7 +168,7 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @echo "Package: $$(shell echo $(2) | tr '_' '-')" > $(WRKDIR)/.$(2).control @echo "Section: $(6)" >> $(WRKDIR)/.$(2).control @echo "Description: $(5)" >> $(WRKDIR)/.$(2).control - @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${CPU_ARCH} + @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) ${ADK_TARGET_CPU_ARCH} @adeps='$$(strip $${IDEPEND_$(1)})'; if [[ -n $$$$adeps ]]; then \ comma=; \ deps=; \ @@ -194,14 +194,14 @@ ifneq ($(ADK_DEBUG),y) @echo "Package: $$(shell echo $(2) | tr '_' '-')-dbg" > $(WRKDIR)/.$(2)-dbg.control @echo "Section: debug" >> $(WRKDIR)/.$(2)-dbg.control @echo "Description: debugging symbols for $(2)" >> $(WRKDIR)/.$(2)-dbg.control - @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DBG} $${ICONTROL_$(1)_DBG} $(3) ${CPU_ARCH} + @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DBG} $${ICONTROL_$(1)_DBG} $(3) ${ADK_TARGET_CPU_ARCH} @echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DBG}/CONTROL/control endif ifneq (,$(filter dev,$(7))) @echo "Package: $$(shell echo $(2) | tr '_' '-')-dev" > $(WRKDIR)/.$(2)-dev.control @echo "Section: devel" >> $(WRKDIR)/.$(2)-dev.control @echo "Description: development files for $(2)" >> $(WRKDIR)/.$(2)-dev.control - @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DEV} $${ICONTROL_$(1)_DEV} $(3) ${CPU_ARCH} + @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)_DEV} $${ICONTROL_$(1)_DEV} $(3) ${ADK_TARGET_CPU_ARCH} @echo "Depends: $$(shell echo $(2) | tr '_' '-')" >> $${IDIR_$(1)_DEV}/CONTROL/control endif diff --git a/mk/perl.mk b/mk/perl.mk index 84e423920..34b4742f9 100644 --- a/mk/perl.mk +++ b/mk/perl.mk @@ -1,2 +1,2 @@ PERL_VERSION=5.18.1 -PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(CPU_ARCH)-linux +PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(ADK_TARGET_CPU_ARCH)-linux diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 29e508f11..b6c95e55d 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -168,19 +168,19 @@ ifeq (,$(filter noremove,${PKG_OPTS})) endif @rm -f '${STAGING_PKG_DIR}/${PKG_NAME}' ifneq (,$(filter dev,${PKG_OPTS})) - @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + @mkdir -p $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include @test -d ${WRKINST}/usr/include && cd ${WRKINST}/usr/include; \ find . -name \*.h | \ - $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include - @mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/include + @mkdir -p $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig @test -d ${WRKINST}/usr/lib/pkgconfig && cd ${WRKINST}/usr/lib/pkgconfig; \ find . -name \*.pc | \ - $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig + $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/lib/pkgconfig @for a in ${WRKINST}/usr/bin/*-config*; do \ [[ -e $$a ]] || continue; \ - mkdir -p $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ - cp $$a $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ - chmod 755 $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin/$$(basename $$a); \ + mkdir -p $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ + cp $$a $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin; \ + chmod 755 $(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/pkg-$(PKG_LIBNAME)-dev/usr/bin/$$(basename $$a); \ done endif @-cd ${WRKINST}; \ @@ -217,9 +217,9 @@ ${_IPKGS_COOKIE}: package: ${ALL_IPKGS} ifneq ($(DEVELOPER),) - @cd ${WRKDIR}/fake-${CPU_ARCH} || exit 1; \ + @cd ${WRKDIR}/fake-${ADK_TARGET_CPU_ARCH} || exit 1; \ y=; sp=; for x in ${ALL_IDIRS}; do \ - y="$$y$$sp$${x#$(WRKDIR)/fake-${CPU_ARCH}/}"; \ + y="$$y$$sp$${x#$(WRKDIR)/fake-${ADK_TARGET_CPU_ARCH}/}"; \ sp=' '; \ done; ls=; ln=; x=1; [[ -z $$y ]] || \ md5sum $$(find $$y -type f) | sed -e "s/*//" | \ diff --git a/mk/qemu.mk b/mk/qemu.mk index f6151eeda..815eee260 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -1,34 +1,34 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -ifeq ($(CPU_ARCH),arm) +ifeq ($(ADK_TARGET_CPU_ARCH),arm) QEMU:= qemu-arm endif -ifeq ($(CPU_ARCH),mipsel) +ifeq ($(ADK_TARGET_CPU_ARCH),mipsel) QEMU:= qemu-mipsel endif -ifeq ($(CPU_ARCH),mips64el) +ifeq ($(ADK_TARGET_CPU_ARCH),mips64el) QEMU:= qemu-mipsel endif -ifeq ($(CPU_ARCH),mips) +ifeq ($(ADK_TARGET_CPU_ARCH),mips) QEMU:= qemu-mips endif -ifeq ($(CPU_ARCH),mips64) +ifeq ($(ADK_TARGET_CPU_ARCH),mips64) QEMU:= qemu-mips endif -ifeq ($(CPU_ARCH),ppc) +ifeq ($(ADK_TARGET_CPU_ARCH),ppc) QEMU:= qemu-ppc endif -ifeq ($(CPU_ARCH),i486) +ifeq ($(ADK_TARGET_CPU_ARCH),i486) QEMU:= qemu-i386 endif -ifeq ($(CPU_ARCH),i586) +ifeq ($(ADK_TARGET_CPU_ARCH),i586) QEMU:= qemu-i386 endif -ifeq ($(CPU_ARCH),i686) +ifeq ($(ADK_TARGET_CPU_ARCH),i686) QEMU:= qemu-i386 endif -ifeq ($(CPU_ARCH),x86_64) +ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) QEMU:= qemu-x86_64 endif diff --git a/mk/vars.mk b/mk/vars.mk index bd77f391f..df46c5f8f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -53,7 +53,7 @@ else GCC_CHECK:= endif -GNU_TARGET_NAME:= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) +GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) TARGET_CROSS:= $(TOOLCHAIN_DIR)/usr/bin/$(GNU_TARGET_NAME)- TARGET_COMPILER_PREFIX?=${TARGET_CROSS} CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} \ @@ -77,8 +77,8 @@ TARGET_CXX+= $(ADK_TARGET_ABI_CFLAGS) endif TARGET_CPPFLAGS:= -TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts -TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident +TARGET_CFLAGS:= $(ADK_TARGET_CFLAGS) -fwrapv -fno-ident -fhonour-copts +TARGET_CXXFLAGS:= $(ADK_TARGET_CFLAGS) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib -- cgit v1.2.3