From d0398dc33628c501388d32dcb3faf68859dd6bcb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 5 Jan 2011 00:18:18 +0100 Subject: update mips qemu targets. 64 Bit kernels still does not boot completely --- mk/build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index f8143311c..de7ece082 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -191,9 +191,9 @@ switch: fi kernelconfig: - cp $(TOPDIR)/target/$(ARCH)/kernel.config $(BUILD_DIR)/linux/.config + cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config $(BUILD_DIR)/linux/.config $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig - cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ARCH)/kernel.config + cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config # create a new package from package/.template newpackage: -- cgit v1.2.3 From 163b7e51f5dba02aa640ce933976719c7b8018d5 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Thu, 6 Jan 2011 20:36:50 +0000 Subject: automatic post-postinstall targets, and exemplary switch of zlib to it Signed-off-by: Thorsten Glaser --- mk/package.mk | 2 ++ mk/pkg-bottom.mk | 2 ++ 2 files changed, 4 insertions(+) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index edbf3c6d5..fb66a0aaf 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -142,6 +142,8 @@ IDIR_$(1)= $(WRKDIR)/fake-${CPU_ARCH}/pkg-$(2) ifneq (${ADK_PACKAGE_$(1)}${DEVELOPER},) ALL_IPKGS+= $$(IPKG_$(1)) ALL_IDIRS+= $${IDIR_$(1)} +ALL_POSTINST+= $(2)-install +$(2)-install: endif INFO_$(1)= $(PKG_STATE_DIR)/info/$(2).list diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 122198e45..6e5fdc3a5 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -127,6 +127,7 @@ endif pre-install: do-install: post-install: +spkg-install: ${ALL_POSTINST} ${_FAKE_COOKIE}: ${_BUILD_COOKIE} -rm -f ${_ALL_CONTROLS} @mkdir -p '${STAGING_PKG_DIR}' ${WRKINST} '${STAGING_TARGET_DIR}/scripts' @@ -145,6 +146,7 @@ else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 endif + env ${MAKE_ENV} ${MAKE} spkg-install $(MAKE_TRACE) ifeq ($(ADK_NATIVE),) @for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ [[ -e $$a ]] || continue; \ -- cgit v1.2.3 From d3b021b5410aeb3f62a7225dccb3f6f2617d4c38 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Jan 2011 16:59:51 +0100 Subject: add toolchain settings menu point - gdb compilation can be disabled - gcc languages (c++/java) can be enabled/disabled - gcc stack smashing protection can be enabled/disabled --- mk/vars.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index 25b285518..bb175928e 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -15,6 +15,9 @@ else TARGET_DEBUGGING:= -fomit-frame-pointer $(TARGET_OPTIMIZATION) endif TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv +ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) +TARGET_CFLAGS+= -fstack-protector +endif BASE_DIR:= $(TOPDIR) DISTDIR?= ${BASE_DIR}/dl -- cgit v1.2.3 From c76fbbb7e8a7517abeec6740272738e121fd6fec Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 7 Jan 2011 15:37:19 +0000 Subject: add choices for both the root login shell and /bin/sh Signed-off-by: Thorsten Glaser --- mk/image.mk | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 1b7178eef..9b74348fe 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -1,6 +1,34 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. +# relative paths, like 'mksh' or '../usr/bin/foosh' +ifeq (${ADK_BINSH_ASH},y) +BINSH:=ash +else ifeq (${ADK_BINSH_BASH},y) +BINSH:=bash +else ifeq (${ADK_BINSH_MKSH},y) +BINSH:=mksh +else ifeq (${ADK_BINSH_ZSH},y) +BINSH:=zsh +else +$(error No /bin/sh configured!) +endif + +# absolute paths +ifeq (${ADK_ROOTSH_ASH},y) +ROOTSH:=/bin/ash +else ifeq (${ADK_ROOTSH_BASH},y) +ROOTSH:=/bin/bash +else ifeq (${ADK_ROOTSH_MKSH},y) +ROOTSH:=/bin/mksh +else ifeq (${ADK_ROOTSH_TCSH},y) +ROOTSH:=/usr/bin/tcsh +else ifeq (${ADK_ROOTSH_ZSH},y) +ROOTSH:=/bin/zsh +else +$(error No login shell configured!) +endif + imageprepare: image-prepare-post extra-install # if an extra directory exist in TOPDIR, copy all content over the @@ -20,6 +48,9 @@ image-prepare-post: mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \ done; \ fi + sed -i '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd + -rm -f ${TARGET_DIR}/bin/sh + ln -sf ${BINSH} ${TARGET_DIR}/bin/sh KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX) -- cgit v1.2.3 From 3c16357a9b7f099238b89d71d4e824cd6baa7427 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 7 Jan 2011 14:25:20 +0000 Subject: make sysroot relative to have a relocatable gcc Signed-off-by: Thorsten Glaser --- mk/vars.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index bb175928e..b376140ed 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -29,6 +29,9 @@ STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC} STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_* STAGING_TARGET_DIR:= ${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC} STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_* +# relation from STAGING_HOST_DIR to STAGING_TARGET_DIR (for gcc to find +# its sysroot while staying relocatable) +STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_LIBC} TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build -- cgit v1.2.3 From a5d49fa95ed67db085ea1f07c9e1733eb5dbc505 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Jan 2011 22:53:31 +0100 Subject: do not set GCC_HONOUR_COPTS for configure step --- mk/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index fb66a0aaf..59fb6a805 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -36,7 +36,8 @@ CONFIGURE_ARGS+= --enable-debug endif endif -CONFIGURE_ENV+= CONFIG_SHELL='$(strip ${SHELL})' \ +CONFIGURE_ENV+= GCC_HONOUR_COPTS=s \ + CONFIG_SHELL='$(strip ${SHELL})' \ CFLAGS='$(strip ${TCFLAGS})' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ CPPFLAGS='$(strip ${TCPPFLAGS})' \ -- cgit v1.2.3 From 8f374d02053d5125df10515084180a6961f35f2d Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 7 Jan 2011 19:12:44 +0000 Subject: =?UTF-8?q?fix=20=E2=80=9Cmake=20kernelconfig=E2=80=9D=20(2=20thin?= =?UTF-8?q?gs):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • patch from wbx to have it copied from/to the correct directory • honour HOSTCC, HOSTCFLAGS Signed-off-by: Thorsten Glaser --- mk/build.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index f8143311c..662ebc221 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -191,9 +191,9 @@ switch: fi kernelconfig: - cp $(TOPDIR)/target/$(ARCH)/kernel.config $(BUILD_DIR)/linux/.config - $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig - cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ARCH)/kernel.config + cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config $(BUILD_DIR)/linux/.config + ${KERNEL_MAKE_ENV} ${MAKE} ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig + cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config # create a new package from package/.template newpackage: -- cgit v1.2.3 From f20a319c04416ceee24107fafcddbe65b7071850 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 7 Jan 2011 19:54:39 +0000 Subject: pass KERNEL_MAKE_ENV to all invocations of make on the Linux kernel similar to KERNEL_MAKE_OPTS just as environment Signed-off-by: Thorsten Glaser --- mk/kernel-build.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index ba3259b16..986eb9c29 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -21,16 +21,16 @@ $(LINUX_DIR)/.config: $(LINUX_DIR)/.prepared $(BUILD_DIR)/.kernelconfig $(TOPDIR $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-configure for f in $(TARGETS);do if [ -f $$f ];then rm $$f;fi;done $(MAKE_TRACE) $(CP) $(BUILD_DIR)/.kernelconfig $(LINUX_DIR)/.config - echo N | $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) - $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE) + echo N | ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} oldconfig $(MAKE_TRACE) + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} prepare scripts $(MAKE_TRACE) touch -c $(LINUX_DIR)/.config $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-compile - $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE) + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} -j${ADK_MAKE_JOBS} LOCALVERSION="" $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET_ARCH)-kernel-modules-install rm -rf $(LINUX_BUILD_DIR)/modules - $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ + ${KERNEL_MAKE_ENV} $(MAKE) ${KERNEL_MAKE_OPTS} DEPMOD=true \ INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ LOCALVERSION="" \ modules_install $(MAKE_TRACE) -- cgit v1.2.3 From c5f31c89138e4bf5f7c2634f770e6b280a9cd334 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 7 Jan 2011 19:55:28 +0000 Subject: =?UTF-8?q?=3D=3Futf-8=3Fq=3Ffix=3D20bcm47xx=3D20flash=3D20size=3D?= =?UTF-8?q?20(by=3D20passing=3D20the=3D20correct=3D20value=3D20via=3D20env?= =?UTF-8?q?ironment)?= =20and=20honour=20HOSTCFLAGS=20better=20(still=20not=20fully=20=E2=98=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thorsten Glaser --- mk/kernel-vars.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 48b7023b5..f66b238e0 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -3,5 +3,13 @@ KERNEL_MAKE_OPTS:= -C "${LINUX_DIR}" V=1 ifneq ($(ADK_NATIVE),y) -KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) CC="$(TARGET_CC)" HOSTCC="${HOSTCC}" +KERNEL_MAKE_OPTS+= CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ + CC="$(TARGET_CC)" HOSTCC="${HOSTCC}" \ + HOSTCFLAGS='${HOSTCFLAGS}' endif + +ifeq (${ADK_TARGET_SYSTEM_LINKSYS_WRT54G},y) +ADK_KCPPFLAGS+= -DBCM47XX_OVERRIDE_FLASHSIZE=0x400000 +endif + +KERNEL_MAKE_ENV+= KCPPFLAGS='${ADK_KCPPFLAGS}' -- cgit v1.2.3 From 5ab78079fc70b8edbef2f04f852ad7bc3ccb2377 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Fri, 7 Jan 2011 19:56:23 +0000 Subject: provide squashfs for bcm47xx including cfgfs partition Signed-off-by: Thorsten Glaser --- mk/image.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 9b74348fe..6b0eff483 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -96,12 +96,16 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR} sed "s#\(.*\)#:0:0::::::\1#" | sort | \ ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null -${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} +${BUILD_DIR}/root.squashfs: ${TARGET_DIR} ${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \ ${BUILD_DIR}/root.squashfs \ -nopad -noappend -root-owned $(MAKE_TRACE) - cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs > \ - ${BUILD_DIR}/${ROOTFSSQUASHFS} + +ifeq (,${CUSTOM_ROOTFSSQUASHFS_BUILD}) +${BIN_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs + cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \ + >${BUILD_DIR}/${ROOTFSSQUASHFS} +endif createinitramfs: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE) -- cgit v1.2.3 From ce0255bbd2d1719f1ce3a30504c19869802c0a8b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Jan 2011 11:22:41 +0100 Subject: rework and cleanup top level directory creation, avoid some unnecessary rebuils --- mk/build.mk | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 662ebc221..3384cc602 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -113,7 +113,8 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean -world: $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR) +world: + mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps $(TOOLS_DIR) $(TOOLS_BUILD_DIR) ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh ${BASH} ${TOPDIR}/scripts/update-sys ${BASH} ${TOPDIR}/scripts/update-pkg @@ -133,18 +134,6 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) ${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages endif -$(DISTDIR): - mkdir -p $(DISTDIR) - -$(BUILD_DIR): - mkdir -p $(BUILD_DIR) - -$(TARGET_DIR): - mkdir -p $(TARGET_DIR) - -$(PACKAGE_DIR): - mkdir -p ${PACKAGE_DIR}/.stamps - ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include} \ ${STAGING_HOST_DIR}/{bin,lib} @@ -564,11 +553,9 @@ bulkallmod: done ${TOPDIR}/bin/tools/pkgmaker: - @mkdir -p $(TOPDIR)/bin/tools @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c ${TOPDIR}/bin/tools/pkgrebuild: - @mkdir -p $(TOPDIR)/bin/tools @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/tools/pkgmaker ${TOPDIR}/bin/tools/pkgrebuild @@ -576,10 +563,7 @@ package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TO @$(TOPDIR)/bin/tools/pkgmaker @:>.menu -$(TOPDIR)/bin/tools: - @mkdir -p $(TOPDIR)/bin/tools - -${TOPDIR}/bin/tools/depmaker: $(TOPDIR)/bin/tools +${TOPDIR}/bin/tools/depmaker: $(HOSTCC) -g -o $(TOPDIR)/bin/tools/depmaker $(TOPDIR)/tools/adk/depmaker.c dep: $(TOPDIR)/bin/tools/depmaker -- cgit v1.2.3 From 422beddb9dcf0a67afe92e70f3afef6baed6a4b0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Jan 2011 19:29:36 +0100 Subject: fix make clean target rule correct the wrong path and remove the correct files on clean. Finetune more directory creation rules. --- mk/build.mk | 7 ++++--- mk/buildhlp.mk | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 3384cc602..9f1841cc2 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -114,7 +114,8 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M .PHONY: all world clean cleantarget cleandir distclean image_clean world: - mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps $(TOOLS_DIR) $(TOOLS_BUILD_DIR) + mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps \ + $(TOOLS_DIR) $(TOOLS_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR) ${BASH} ${TOPDIR}/scripts/scan-pkgs.sh ${BASH} ${TOPDIR}/scripts/update-sys ${BASH} ${TOPDIR}/scripts/update-pkg @@ -200,7 +201,7 @@ root_clean: mkdir -p $(TARGET_DIR) # Do a per-package clean here, too. This way stale headers and -# libraries from cross_*/target/ get wiped away, which keeps +# libraries from target_*/ get wiped away, which keeps # future package build's configure scripts from returning false # dependencies information. @@ -210,7 +211,7 @@ clean: for d in ${STAGING_PKG_DIR}; do \ for f in $$(ls $$d/[a-z]* 2>/dev/null); do \ while read file ; do \ - rm $$d/target/$$file 2>/dev/null; \ + rm ${STAGING_TARGET_DIR}/$$file 2>/dev/null;\ done < $$f ; \ rm $$f ; \ done \ diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 35d4eebd0..c7c598de3 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -25,6 +25,7 @@ _CHECKSUM_COOKIE= endif post-extract: + @mkdir -p ${PACKAGE_DIR}/.stamps ifeq ($(strip ${NO_DISTFILES}),1) ${WRKDIST}/.extract_done: -- cgit v1.2.3 From 18aa85857ca8fa9d75d41c36665a1cb7e8bbda5c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Jan 2011 19:56:21 +0100 Subject: variable name cleanup --- mk/package.mk | 2 +- mk/pkg-bottom.mk | 2 +- mk/vars.mk | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index 59fb6a805..d9d10c79d 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -219,7 +219,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ - $(TOPDIR)/bin/tools/cpio -padlmu '$${STAGING_TARGET_DIR}' + $(TOOLS_DIR)/cpio -padlmu '$${STAGING_TARGET_DIR}' @cd '$${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PKG_DIR}/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 6e5fdc3a5..f91e1bb45 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -170,7 +170,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ - $(TOPDIR)/bin/tools/cpio -padlmu '${STAGING_TARGET_DIR}' + $(TOOLS_DIR)/cpio -padlmu '${STAGING_TARGET_DIR}' @cd '${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$' \ '${STAGING_PKG_DIR}/${PKG_NAME}' | while read fn; do \ chmod u+w $$fn; \ diff --git a/mk/vars.mk b/mk/vars.mk index b376140ed..37461e981 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -108,19 +108,19 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + cat $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ - gzip -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + gzip -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ - bzip2 -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ + bzip2 -dc $$file | $(TOOLS_DIR)/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ - cat $$file | $(TOPDIR)/bin/tools/cpio -ivd -H zip ;; \ + cat $$file | $(TOOLS_DIR)/cpio -ivd -H zip ;; \ *.arm) \ cp $$file ${WRKDIR} ;; \ *) \ -- cgit v1.2.3 From f710a956089686dc168fe3cb8d2ebd6cb997c9ba Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:31 +0100 Subject: base-files: change access mode of /tmp where it's created Signed-off-by: Phil Sutter --- mk/image.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 1b7178eef..c7f568c26 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -14,7 +14,6 @@ image-prepare-post: dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \ chmod 600 ${TARGET_DIR}/etc/.rnd chmod 4511 ${TARGET_DIR}/bin/busybox - chmod 1777 ${TARGET_DIR}/tmp @if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \ for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \ mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \ -- cgit v1.2.3 From 2d2cde54102a8cbb12753c7a67058154b6f9c035 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:50 +0100 Subject: make installation of package init scripts optional Signed-off-by: Phil Sutter --- mk/package.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index edbf3c6d5..3d7353a51 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -181,6 +181,7 @@ $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE} ifeq ($(ADK_DEBUG),) $${RSTRIP} $${IDIR_$(1)} $(MAKE_TRACE) endif +ifeq (${ADK_INSTALL_PACKAGE_INIT_SCRIPTS},y) @for file in $$$$(ls ./files/*.init 2>/dev/null); do \ fname=$$$$(echo $$$$file| sed -e "s#.*/##" -e "s#.init##"); \ check=$$$$(grep PKG $$$$file|cut -d ' ' -f 2); \ @@ -192,6 +193,7 @@ endif [[ -e $$$$script ]] || continue; \ chmod 0755 "$$$$script"; \ done +endif @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}' \ '$${STAGING_TARGET_DIR}/scripts' ifeq (,$(filter noremove,$(7))) -- cgit v1.2.3 From eebde77970ce3476e24d11e4adad992f5b670784 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:52 +0100 Subject: allow disabling kernel customisation completely Signed-off-by: Phil Sutter --- mk/kernel.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk/kernel.mk b/mk/kernel.mk index 2ce156694..d5288cd7e 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -33,6 +33,7 @@ IDEPENDK_$(1):=kernel ($(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX) I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) +ifeq ($${ADK_TARGET_KERNEL_CUSTOMISING},y) ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m) TARGETS+=$$(PKG_$(1)) endif @@ -40,6 +41,7 @@ ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),y) TARGETS+=$$(PKG_$(1)) INSTALL_TARGETS+=$$(PKG_$(1)) endif +endif $$(PKG_$(1)): rm -rf $$(I_$(1)) -- cgit v1.2.3 From a217fc80b29080dae963bb15051df023de36ce39 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 10:59:12 +0100 Subject: add LTO support to toolchain settings. Cleanup SYSROOT mess. - just use on sysroot directory for toolchain. - add missing patches from previos commit. (rpath/cflags cleanup) --- mk/build.mk | 1 + mk/buildhlp.mk | 4 +++- mk/vars.mk | 13 ++++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 9f1841cc2..7c8a697f8 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -554,6 +554,7 @@ bulkallmod: done ${TOPDIR}/bin/tools/pkgmaker: + @mkdir -p $(TOPDIR)/bin/tools @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c ${TOPDIR}/bin/tools/pkgrebuild: diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index c7c598de3..2cb4f1714 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -24,9 +24,11 @@ else _CHECKSUM_COOKIE= endif -post-extract: +${PACKAGE_DIR}/.stamps: @mkdir -p ${PACKAGE_DIR}/.stamps +post-extract: ${PACKAGE_DIR}/.stamps + ifeq ($(strip ${NO_DISTFILES}),1) ${WRKDIST}/.extract_done: rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD} diff --git a/mk/vars.mk b/mk/vars.mk index 37461e981..7828347d5 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -9,14 +9,23 @@ INSTALL_SCRIPT= install -m0755 MAKEFLAGS= $(EXTRA_MAKEFLAGS) BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) + +# target compiler settings +TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include +TARGET_LDFLAGS+= -Wl,-O2 ifneq ($(ADK_DEBUG),) TARGET_DEBUGGING:= -g3 -fno-omit-frame-pointer else -TARGET_DEBUGGING:= -fomit-frame-pointer $(TARGET_OPTIMIZATION) +TARGET_DEBUGGING:= $(TARGET_OPTIMIZATION) -fomit-frame-pointer endif TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) TARGET_CFLAGS+= -fstack-protector +TARGET_LDFLAGS+= -fstack-protector +endif +ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),) +TARGET_CFLAGS+= -flto +TARGET_LDFLAGS+= -flto endif BASE_DIR:= $(TOPDIR) @@ -56,8 +65,6 @@ endif TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld -TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include -TARGET_LDFLAGS+= -Wl,-O2 PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh SED:= sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux -- cgit v1.2.3 From 2d12c0b270254b0a2102fd032b9de406584297ae Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 11:07:32 +0100 Subject: busybox wget does not know tries --- mk/vars.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index 7828347d5..0dd616846 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -140,6 +140,6 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --tries=1 --timeout=30 $(QUIET) +FETCH_CMD?= wget --timeout=30 $(QUIET) include $(TOPDIR)/mk/mirrors.mk -- cgit v1.2.3 From 1edd657512fe89c6727a3d8adb68f29568078347 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Jan 2011 12:17:41 +0100 Subject: create directory where others are created --- mk/build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 7c8a697f8..92a5e947a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -136,7 +136,7 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) endif ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: - mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include} \ + mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include,usr/lib} \ ${STAGING_HOST_DIR}/{bin,lib} ${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc -- cgit v1.2.3 From 72d93163012bc54c99ba5cd589f583fbf2c0dad6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Jan 2011 13:58:28 +0100 Subject: fix bzr package build --- mk/build.mk | 1 - mk/vars.mk | 1 - 2 files changed, 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 92a5e947a..e5ecaa4cf 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -14,7 +14,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_STATIC=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ - ADK_PACKAGE_BZR=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ diff --git a/mk/vars.mk b/mk/vars.mk index 0dd616846..6a0f50a2f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -54,7 +54,6 @@ TARGET_DIR_PFX:= $(BASE_DIR)/root_* TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux -TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev ifeq ($(ADK_NATIVE),y) TARGET_CROSS:= TARGET_COMPILER_PREFIX?= -- cgit v1.2.3 From cbd0e559e6d11662e8cc685a53ff15a4ee2b1236 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Jan 2011 18:12:29 +0100 Subject: remove from TODO list, enable aufs2-util on bulk builds. --- mk/build.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 92a5e947a..1cd50ea9b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -16,7 +16,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_MAKE_JOBS=4 \ ADK_PACKAGE_BZR=n \ ADK_PACKAGE_GRUB=n \ - ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_MGETTY=n \ ADK_COMPILE_HEIMDAL=n \ @@ -553,7 +552,7 @@ bulkallmod: done <${TOPDIR}/target/arch.lst ;\ done -${TOPDIR}/bin/tools/pkgmaker: +${TOPDIR}/bin/tools/pkgmaker: tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c @mkdir -p $(TOPDIR)/bin/tools @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c -- cgit v1.2.3 From 59f1e5ee4443e6210b148c58af56bef3e9a75f2b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Jan 2011 18:12:49 +0100 Subject: fix target system names --- mk/modules.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 94a1d235a..27b02bbf7 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -926,11 +926,13 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ ,11)) ZLIB:=lib/zlib_deflate/zlib_deflate -ifeq ($(ADK_LINUX_CRIS_FOXBOARD),) -ifeq ($(ADK_LINUX_MIPS_AG241),) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX832),y) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX416),y) +ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y) ZLIB+=lib/zlib_inflate/zlib_inflate endif endif +endif $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ $(foreach mod, $(ZLIB),$(MODULES_DIR)/kernel/$(mod)) \ @@ -1177,11 +1179,13 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ # USB # -ifeq ($(ADK_LINUX_CRIS_FOXBOARD),) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX832),) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX416),) $(eval $(call KMOD_template,USB,usb,\ $(MODULES_DIR)/kernel/drivers/usb/core/usbcore \ ,50)) endif +endif $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \ -- cgit v1.2.3 From 308fc79fcf997737d3bae757046bfd981c75489e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Jan 2011 20:42:45 +0100 Subject: fix squashfs target --- mk/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 1bfc1f78b..5c3d27c41 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -101,7 +101,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} -nopad -noappend -root-owned $(MAKE_TRACE) ifeq (,${CUSTOM_ROOTFSSQUASHFS_BUILD}) -${BIN_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs +${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs cat ${BUILD_DIR}/${TARGET_KERNEL} ${BUILD_DIR}/root.squashfs \ >${BUILD_DIR}/${ROOTFSSQUASHFS} endif -- cgit v1.2.3 From 59847d1d06a7cb8c51f1ce730060a9f5819c95eb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Jan 2011 20:49:53 +0100 Subject: disable LTO and SSP for bulk builds --- mk/build.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index ef551741a..eaf547c0b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -16,13 +16,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_MAKE_JOBS=4 \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ - ADK_PACKAGE_MGETTY=n \ - ADK_COMPILE_HEIMDAL=n \ - ADK_PACKAGE_HEIMDAL_PKINIT=n \ - ADK_PACKAGE_HEIMDAL_SERVER=n \ - ADK_PACKAGE_LIBHEIMDAL=n \ - ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \ ADK_PACKAGE_PYTHON=n \ + ADK_TOOLCHAIN_GCC_USE_SSP=n \ + ADK_TOOLCHAIN_GCC_USE_LTO=n \ BUSYBOX_BBCONFIG=n \ BUSYBOX_SELINUX=n \ BUSYBOX_INSTALL_NO_USR=n \ -- cgit v1.2.3 From 1916f3b53bec7c7bc3629e1d9f7c8457c14220c6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Jan 2011 22:22:13 +0100 Subject: fix python vars --- mk/python.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/python.mk b/mk/python.mk index e0fce5f0e..5767b12f7 100644 --- a/mk/python.mk +++ b/mk/python.mk @@ -1,3 +1,3 @@ PYTHON_VERSION=2.7 -PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/lib -PYTHON:=${STAGING_HOST_DIR}/bin/hostpython +PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib +PYTHON:=${STAGING_HOST_DIR}/usr/bin/hostpython -- cgit v1.2.3 From 1ee30e3c419824f45dc52d67516274548548b574 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Jan 2011 17:26:47 +0100 Subject: update to Linux Kernel 2.6.37 --- mk/kernel-ver.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 50b8c4056..1741c62d0 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,3 +1,3 @@ -KERNEL_VERSION:= 2.6.36 +KERNEL_VERSION:= 2.6.37 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 61f3739a73afb6914cb007f37fb09b62 +KERNEL_MD5SUM:= c8ee37b4fdccdb651e0603d35350b434 -- cgit v1.2.3 From fd6e91a86e8d3bff49f1e893ad243d8fc0e324a5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 13 Jan 2011 17:28:19 +0100 Subject: allow cross-compile under Darwin, fix ppp install targets --- mk/build.mk | 2 +- mk/package.mk | 3 +++ mk/vars.mk | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index ef551741a..a72cd4f05 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -135,7 +135,7 @@ endif ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/include,usr/lib} \ - ${STAGING_HOST_DIR}/{bin,lib} + ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib} ${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) diff --git a/mk/package.mk b/mk/package.mk index e42ced661..cab7b6947 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -75,9 +75,12 @@ MAKE_ENV+= PATH='${TARGET_PATH}' \ ${HOST_CONFIGURE_OPTS} \ CC='${TARGET_CC}' \ CXX='${TARGET_CXX}' \ + LD='${TARGET_LD}' \ AR='${TARGET_CROSS}ar' \ RANLIB='${TARGET_CROSS}ranlib' \ NM='${TARGET_CROSS}nm' \ + OBJCOPY='${TARGET_CROSS}objcopy' \ + RANLIB='${TARGET_CROSS}ranlib' \ STRIP='${TARGET_CROSS}strip' \ CROSS="$(TARGET_CROSS)" endif diff --git a/mk/vars.mk b/mk/vars.mk index 6a0f50a2f..8bbb7765b 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -51,7 +51,7 @@ BIN_DIR_PFX:= $(BASE_DIR)/bin PACKAGE_DIR:= $(BIN_DIR)/packages TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} TARGET_DIR_PFX:= $(BASE_DIR)/root_* -TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} +TARGET_PATH= ${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH} REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX) GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux ifeq ($(ADK_NATIVE),y) -- cgit v1.2.3 From 15c84adca94bfe4a89ece5c04f06a884cf508ebb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 17 Jan 2011 21:55:49 +0100 Subject: fix packages to be compile with stack protector - libtool do not pass -fstack-protector while linking, but this is required to successfully link libraries or executables with SSP - pass LDFLAGS for non-libtool packages --- mk/package.mk | 4 ++++ mk/vars.mk | 1 + 2 files changed, 5 insertions(+) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index cab7b6947..bacee71f4 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -3,6 +3,10 @@ all: build-all-pkgs +ifeq ($(ADK_HOST_CYGWIN),y) +EXEEXT:= .exe +endif + TCFLAGS:= ${TARGET_CFLAGS} TCXXFLAGS:= ${TARGET_CFLAGS} TCPPFLAGS:= ${TARGET_CPPFLAGS} diff --git a/mk/vars.mk b/mk/vars.mk index 8bbb7765b..ab247901f 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -21,6 +21,7 @@ endif TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) TARGET_CFLAGS+= -fstack-protector +TARGET_CXXFLAGS+= -fstack-protector TARGET_LDFLAGS+= -fstack-protector endif ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),) -- cgit v1.2.3