diff options
52 files changed, 128 insertions, 187 deletions
diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 148e7a756..1e87536d5 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -365,7 +365,7 @@ int main() { p_ptr = NULL; s_ptr = NULL; - system("rm package/Config.in.auto.*"); + system("rm package/Config.in.auto.* 2>/dev/null"); unlink(runtime); /* open global sectionfile */ menuglobal = fopen("package/Config.in.auto.global", "w"); 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 diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 36ed09f06..f5c852fb2 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -24,8 +24,8 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual BB_MAKE_FLAGS:= V=1 \ - ARCH="${ARCH}" \ - IPKG_ARCH="${CPU_ARCH}" \ + ARCH="${ADK_TARGET_ARCH}" \ + IPKG_ARCH="${ADK_TARGET_CPU_ARCH}" \ HOSTCC="${CC_FOR_BUILD}" \ HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \ CROSS_COMPILE="$(TARGET_CROSS)" diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index e7f3493f3..64c333548 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -123,7 +123,7 @@ endif CONFIG_STYLE:= minimal CONFIGURE_ARGS:= --prefix=/usr \ --target-os=linux \ - --arch=${CPU_ARCH} \ + --arch=${ADK_TARGET_CPU_ARCH} \ --enable-cross-compile \ --sysroot=${STAGING_TARGET_DIR} \ --cross-prefix=${TARGET_CROSS} \ diff --git a/package/gcc/Makefile b/package/gcc/Makefile index bef430d12..88cc5b436 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ else CONFIGURE_ARGS+= --enable-languages=c endif -ifeq ($(CPU_ARCH),ppc) +ifeq ($(ADK_TARGET_CPU_ARCH),ppc) CONFIGURE_ARGS+= --disable-target-optspace --with-long-double-64 --enable-secureplt TARGET_CFLAGS+= '-Wl,--secure-plt' else diff --git a/package/glibc/Makefile b/package/glibc/Makefile index a74493e23..ff7e1277d 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -42,7 +42,7 @@ endif glibc-dev-install: ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH) $(IDIR_GLIBC_DEV)/usr/lib # install linker script - cp ./files/libc.so.$(CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so + cp ./files/libc.so.$(ADK_TARGET_CPU_ARCH) $(IDIR_GLIBC_DEV)/usr/lib/libc.so ifeq ($(ADK_TARGET_ABI_O32),y) ifeq ($(ADK_big),y) $(SED) "s#@@ELFTARGET@@#elf32-tradbigmips#" $(IDIR_GLIBC_DEV)/usr/lib/libc.so diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile index dca03494e..96a6cd5bb 100644 --- a/package/libhugetlbfs/Makefile +++ b/package/libhugetlbfs/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBHUGETLBFS,libhugetlbfs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual -XAKE_FLAGS+= PREFIX=/usr DESTDIR=${WRKINST} ADK_ARCH=${CPU_ARCH} +XAKE_FLAGS+= PREFIX=/usr DESTDIR=${WRKINST} ADK_ARCH=${ADK_TARGET_CPU_ARCH} ALL_TARGET:= libs tools libhugetlbfs-install: diff --git a/package/libmad/Makefile b/package/libmad/Makefile index b12245425..62afb0b24 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -21,31 +21,31 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBMAD,libmad,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) FPM:=default -ifeq (${CPU_ARCH},i486) +ifeq (${ADK_TARGET_CPU_ARCH},i486) FPM:=intel endif -ifeq (${CPU_ARCH},i586) +ifeq (${ADK_TARGET_CPU_ARCH},i586) FPM:=intel endif -ifeq (${CPU_ARCH},i686) +ifeq (${ADK_TARGET_CPU_ARCH},i686) FPM:=intel endif -ifeq (${CPU_ARCH},arm) +ifeq (${ADK_TARGET_CPU_ARCH},arm) FPM:=arm endif -ifeq (${CPU_ARCH},mipsel) +ifeq (${ADK_TARGET_CPU_ARCH},mipsel) FPM:=mips endif -ifeq (${CPU_ARCH},mips) +ifeq (${ADK_TARGET_CPU_ARCH},mips) FPM:=mips endif -ifeq (${CPU_ARCH},ppc) +ifeq (${ADK_TARGET_CPU_ARCH},ppc) FPM:=ppc endif -ifeq (${CPU_ARCH},sparc) +ifeq (${ADK_TARGET_CPU_ARCH},sparc) FPM:=sparc endif -ifeq (${CPU_ARCH},x86_64) +ifeq (${ADK_TARGET_CPU_ARCH},x86_64) FPM:=64bit endif diff --git a/package/libnet/Makefile b/package/libnet/Makefile index 72bbd2800..45c11c02f 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -23,13 +23,13 @@ $(eval $(call PKG_template,LIBNET,libnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP AUTOTOOL_STYLE:= autoreconf ENDIAN:=lil -ifeq (${CPU_ARCH},mips) +ifeq (${ADK_TARGET_CPU_ARCH},mips) ENDIAN:=big endif -ifeq (${CPU_ARCH},mips64) +ifeq (${ADK_TARGET_CPU_ARCH},mips64) ENDIAN:=big endif -ifeq (${CPU_ARCH},ppc) +ifeq (${ADK_TARGET_CPU_ARCH},ppc) ENDIAN:=big endif diff --git a/package/musl/Makefile b/package/musl/Makefile index a440cd7d4..c1606b5dd 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -24,32 +24,32 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -MARCH:= $(CPU_ARCH) -ifeq ($(CPU_ARCH),i686) +MARCH:= $(ADK_TARGET_CPU_ARCH) +ifeq ($(ADK_TARGET_CPU_ARCH),i686) MARCH:= i386 endif -ifeq ($(CPU_ARCH),i586) +ifeq ($(ADK_TARGET_CPU_ARCH),i586) MARCH:= i386 endif -ifeq ($(CPU_ARCH),i486) +ifeq ($(ADK_TARGET_CPU_ARCH),i486) MARCH:= i386 endif -ifeq ($(CPU_ARCH),mipsel) +ifeq ($(ADK_TARGET_CPU_ARCH),mipsel) MARCH:= mips endif -ifeq ($(CPU_ARCH),mips64el) +ifeq ($(ADK_TARGET_CPU_ARCH),mips64el) MARCH:= mips endif -ifeq ($(CPU_ARCH),mips64) +ifeq ($(ADK_TARGET_CPU_ARCH),mips64) MARCH:= mips endif -ifeq ($(CPU_ARCH),ppc) +ifeq ($(ADK_TARGET_CPU_ARCH),ppc) MARCH:= powerpc endif -ifeq ($(CPU_ARCH),sh4) +ifeq ($(ADK_TARGET_CPU_ARCH),sh4) MARCH:= sh endif -ifeq ($(CPU_ARCH),sh4eb) +ifeq ($(ADK_TARGET_CPU_ARCH),sh4eb) MARCH:= sheb endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) diff --git a/package/nss/Makefile b/package/nss/Makefile index 4468cadf5..589e6f259 100644 --- a/package/nss/Makefile +++ b/package/nss/Makefile @@ -45,7 +45,7 @@ TARGET_LDFLAGS+= -ldl -pthread -lrt XAKE_FLAGS+= SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}" -XAKE_FLAGS+= NSS_DISABLE_DBM=1 OS_TEST=${CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux +XAKE_FLAGS+= NSS_DISABLE_DBM=1 OS_TEST=${ADK_TARGET_CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux XAKE_FLAGS+= ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_SYSTEM_SQLITE=1 XAKE_FLAGS+= NSS_USE_SYSTEM_ZLIB=1 ALL_TARGET:= all diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index cd0fa2646..9147f5dbb 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -44,11 +44,11 @@ TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) BOOTSTRAPJDK:= ${STAGING_HOST_DIR}/bootstrap-jdk -JDKARCH:= $(CPU_ARCH) -ifeq ($(ARCH),x86) +JDKARCH:= $(ADK_TARGET_CPU_ARCH) +ifeq ($(ADK_TARGET_ARCH),x86) JDKARCH:= i386 endif -ifeq ($(CPU_ARCH),x86_64) +ifeq ($(ADK_TARGET_CPU_ARCH),x86_64) JDKARCH:= amd64 endif diff --git a/package/perl/Makefile b/package/perl/Makefile index 6d9249e79..f57a058ff 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -58,7 +58,7 @@ do-configure: -e 's!%%CPPFLAGS%%!$(TARGET_CPPFLAGS)!g' \ -e 's!%%LIBDIRS%%!$(STAGING_TARGET_DIR)/lib $(STAGING_TARGET_DIR)/usr/lib!g' \ -e 's!%%INCDIRS%%!$(STAGING_TARGET_DIR)/include $(STAGING_TARGET_DIR)/usr/include!g' \ - ./files/config.sh.$(CPU_ARCH).$(ADK_TARGET_LIBC) > ${WRKBUILD}/config.sh + ./files/config.sh.$(ADK_TARGET_CPU_ARCH).$(ADK_TARGET_LIBC) > ${WRKBUILD}/config.sh $(SED) "s#@@STAGING_HOST_DIR@@#${STAGING_HOST_DIR}/usr/bin#" ${WRKBUILD}/Makefile.SH $(SED) "s#@@LIB@@##" ${WRKBUILD}/Makefile.SH (cd ${WRKBUILD}; ./Configure -S) diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile index c96ec7010..22366e38a 100644 --- a/package/ruby-ldap/Makefile +++ b/package/ruby-ldap/Makefile @@ -26,7 +26,7 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= DESTDIR="/" do-configure: - (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_TARGET_DIR)/usr/lib/ruby/2.0.0/$(CPU_ARCH)-linux/ extconf.rb \ + (cd $(WRKBUILD) && $(STAGING_HOST_DIR)/usr/bin/ruby -I$(STAGING_TARGET_DIR)/usr/lib/ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux/ extconf.rb \ --with-openldap2 \ --without-libnsl \ --with-ldap-dir=$(STAGING_TARGET_DIR)/usr \ @@ -34,10 +34,10 @@ do-configure: --with-ldap-include=$(STAGING_TARGET_DIR)/usr/include) ruby-ldap-install: - $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux + $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux $(INSTALL_DIR) $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap - $(CP) $(STAGING_TARGET_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux/ldap.so \ - $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(CPU_ARCH)-linux + $(CP) $(STAGING_TARGET_DIR)/usr/lib/ruby/site_ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux/ldap.so \ + $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/$(ADK_TARGET_CPU_ARCH)-linux $(CP) $(STAGING_TARGET_DIR)//usr/lib/ruby/site_ruby/2.0.0/ldap/*.rb \ $(IDIR_RUBY_LDAP)/usr/lib/ruby/site_ruby/2.0.0/ldap @@ -25,16 +25,16 @@ SET_DASHX:= : endif # Strip off the annoying quoting -ADK_TARGET_KERNEL:= $(strip $(subst ",, $(ADK_TARGET_KERNEL))) ADK_TARGET_ARCH:= $(strip $(subst ",, $(ADK_TARGET_ARCH))) ADK_TARGET_SYSTEM:= $(strip $(subst ",, $(ADK_TARGET_SYSTEM))) +ADK_TARGET_CPU_ARCH:= $(strip $(subst ",, $(ADK_TARGET_CPU_ARCH))) +ADK_TARGET_KERNEL:= $(strip $(subst ",, $(ADK_TARGET_KERNEL))) ADK_TARGET_LIBC:= $(strip $(subst ",, $(ADK_TARGET_LIBC))) ADK_TARGET_LIBC_PATH:= $(strip $(subst ",, $(ADK_TARGET_LIBC_PATH))) ADK_TARGET_ENDIAN:= $(strip $(subst ",, $(ADK_TARGET_ENDIAN))) ADK_TARGET_FLOAT:= $(strip $(subst ",, $(ADK_TARGET_FLOAT))) ADK_TARGET_FPU:= $(strip $(subst ",, $(ADK_TARGET_FPU))) ADK_TARGET_ARM_MODE:= $(strip $(subst ",, $(ADK_TARGET_ARM_MODE))) -ADK_TARGET_CPU_ARCH:= $(strip $(subst ",, $(ADK_TARGET_CPU_ARCH))) ADK_TARGET_CFLAGS:= $(strip $(subst ",, $(ADK_TARGET_CFLAGS))) ADK_TARGET_CFLAGS_OPT:= $(strip $(subst ",, $(ADK_TARGET_CFLAGS_OPT))) ADK_TARGET_ABI_CFLAGS:= $(strip $(subst ",, $(ADK_TARGET_ABI_CFLAGS))) @@ -57,12 +57,6 @@ ADK_PARAMETER_NETCONSOLE_DST_IP:= $(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE ADK_JFFS2_OPTS:= $(strip $(subst ",, $(ADK_JFFS2_OPTS))) ADK_WGET_TIMEOUT:= $(strip $(subst ",, $(ADK_WGET_TIMEOUT))) -ifeq ($(strip ${ADK_HAVE_DOT_CONFIG}),y) -ifneq ($(strip $(wildcard $(TOPDIR)/target/$(ADK_TARGET_ARCH)/target.mk)),) -include $(TOPDIR)/target/$(ADK_TARGET_ARCH)/target.mk -endif -endif - include $(TOPDIR)/mk/vars.mk ifneq (${show},) diff --git a/target/aarch64/target.mk b/target/aarch64/target.mk deleted file mode 100644 index 95a9f3337..000000000 --- a/target/aarch64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= arm64 -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/arm/Makefile b/target/arm/Makefile index b1bded531..71c8293c4 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -29,7 +29,7 @@ ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y) QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -net user -net nic,model=lan9118 endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) -QEMU_ARGS+=-drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user +QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user endif # target helper text @@ -39,9 +39,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB)$(ADK_TARGET_QEMU_ARM_MODEL_TERRIER)$(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @echo "Use following command to install it on SD card:" @@ -61,7 +61,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -74,7 +74,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/arm/target.mk b/target/arm/target.mk deleted file mode 100644 index 87db1e279..000000000 --- a/target/arm/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= arm -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/m68k/target.mk b/target/m68k/target.mk deleted file mode 100644 index 80b1424a6..000000000 --- a/target/m68k/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= m68k -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 6efcf777f..bda87da84 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -24,7 +24,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -37,7 +37,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif ifeq ($(ADK_TARGET_FS),squashfs) @@ -46,7 +46,7 @@ targethelp: @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif endif ifeq ($(ADK_TARGET_FS),jffs2) @@ -55,7 +55,7 @@ targethelp: @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' endif endif diff --git a/target/microblaze/target.mk b/target/microblaze/target.mk deleted file mode 100644 index c179123f9..000000000 --- a/target/microblaze/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= microblaze -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/mips/Makefile b/target/mips/Makefile index c18658ce7..25b77ee39 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -21,9 +21,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) @echo "Use following command to install it on CF card:" @@ -39,7 +39,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -52,7 +52,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif ifeq ($(ADK_TARGET_FS),nfsroot) diff --git a/target/mips/target.mk b/target/mips/target.mk deleted file mode 100644 index 8b13be890..000000000 --- a/target/mips/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= mips -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/mips64/Makefile b/target/mips64/Makefile index e5507e9d1..237c8d75a 100644 --- a/target/mips64/Makefile +++ b/target/mips64/Makefile @@ -48,9 +48,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) @echo "Startup the Lemote Yeelong and type del to enter PMON:" @@ -69,7 +69,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -77,7 +77,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/mips64/target.mk b/target/mips64/target.mk deleted file mode 100644 index 8b13be890..000000000 --- a/target/mips64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= mips -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/ppc/Makefile b/target/ppc/Makefile index b3845672f..a43b57114 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -21,9 +21,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -32,7 +32,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -45,7 +45,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/ppc/target.mk b/target/ppc/target.mk deleted file mode 100644 index 47ae3121f..000000000 --- a/target/ppc/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= powerpc -CPU_ARCH:= ppc -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) -Wl,--secure-plt diff --git a/target/ppc64/Makefile b/target/ppc64/Makefile index 0f0b0c03a..27bc62e12 100644 --- a/target/ppc64/Makefile +++ b/target/ppc64/Makefile @@ -20,9 +20,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -31,7 +31,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -44,7 +44,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/ppc64/target.mk b/target/ppc64/target.mk deleted file mode 100644 index 5a0ecc30f..000000000 --- a/target/ppc64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= powerpc -CPU_ARCH:= ppc64 -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sh/Makefile b/target/sh/Makefile index b89e6e740..581ddf6dc 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -25,9 +25,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -36,7 +36,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -49,7 +49,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/sh/target.mk b/target/sh/target.mk deleted file mode 100644 index 408dd12c5..000000000 --- a/target/sh/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= sh -CPU_ARCH:= $(ADK_TARGET_CPU_ARCH) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sparc/Makefile b/target/sparc/Makefile index 0b7dd1ce9..c8fed4d87 100644 --- a/target/sparc/Makefile +++ b/target/sparc/Makefile @@ -19,9 +19,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -30,7 +30,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -43,7 +43,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/sparc/target.mk b/target/sparc/target.mk deleted file mode 100644 index 960a7cf19..000000000 --- a/target/sparc/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= sparc -CPU_ARCH:= sparc -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 51b1fa89b..ee0b10dad 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -14,7 +14,7 @@ QEMU_ARGS+=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-net nic,model=virtio -net user ifeq ($(ADK_TARGET_FS),archive) -QEMU_ARGS+=-drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 +QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0 endif endif @@ -25,9 +25,9 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -36,7 +36,7 @@ targethelp: @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @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) @@ -49,7 +49,7 @@ targethelp: @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_TARGET_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/sparc64/target.mk b/target/sparc64/target.mk deleted file mode 100644 index dda789e55..000000000 --- a/target/sparc64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= sparc -CPU_ARCH:= sparc64 -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/x86/Makefile b/target/x86/Makefile index 19bca57ab..a4d3ee58c 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -31,18 +31,18 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) - @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img' else - @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_HARDWARE_VBOX),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a VirtualBox Image:" - @echo "./scripts/create.sh -T vdi vbox-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh -T vdi vbox-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" endif endif ifeq ($(ADK_TARGET_FS),initramfs) diff --git a/target/x86/target.mk b/target/x86/target.mk deleted file mode 100644 index ecb811221..000000000 --- a/target/x86/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= x86 -CPU_ARCH:= $(strip $(subst ",, $(ADK_TARGET_CPU_ARCH))) -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index ccb8c9766..e49d23029 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -31,18 +31,18 @@ targethelp: ifeq ($(ADK_TARGET_QEMU),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) - @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} qemu-${ADK_TARGET_CPU_ARCH}.img' else - @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${ADK_TARGET_CPU_ARCH}.img' endif endif ifeq ($(ADK_HARDWARE_VBOX),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a VirtualBox Image:" - @echo "./scripts/create.sh -T vdi vbox-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "./scripts/create.sh -T vdi vbox-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" endif endif ifeq ($(ADK_TARGET_FS),initramfs) diff --git a/target/x86_64/target.mk b/target/x86_64/target.mk deleted file mode 100644 index f381673fa..000000000 --- a/target/x86_64/target.mk +++ /dev/null @@ -1,4 +0,0 @@ -include $(TOPDIR)/mk/kernel-ver.mk -ARCH:= x86 -CPU_ARCH:= x86_64 -TARGET_CFLAGS_ARCH:= $(ADK_TARGET_CFLAGS) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 36fd30deb..f82fe7002 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -89,7 +89,7 @@ else GCC_CONFOPTS+= --enable-target-optspace endif -ifeq ($(ARCH),arm) +ifeq ($(ADK_TARGET_ARCH),arm) GCC_CONFOPTS+= --with-float=$(ADK_TARGET_FLOAT) ifneq ($(ADK_TARGET_FPU),) GCC_CONFOPTS+= --with-fpu=$(ADK_TARGET_FPU) diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index b095c4ab5..f1163195c 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -10,9 +10,6 @@ ifneq ($(ADK_DEBUG),) TARGET_CFLAGS+= -O2 endif -# ssp unsupported -TARGET_CFLAGS:= $(filter-out -fstack-protector-all,$(TARGET_CFLAGS)) - include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 44ae9944d..79f6351d7 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk include ../rules.mk +include ${TOPDIR}/mk/kernel-ver.mk include $(TOPDIR)/mk/linux.mk include ${TOPDIR}/mk/kernel-vars.mk include ${TOPDIR}/mk/buildhlp.mk diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index b49b793f2..720f1a41e 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -6,7 +6,7 @@ include ../rules.mk include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk -ifeq ($(CPU_ARCH),ppc) +ifeq ($(ADK_TARGET_CPU_ARCH),ppc) GNU_TARGET_NAME:= $(subst ppc,powerpc,$(GNU_TARGET_NAME)) endif |