From d1347f55e26d4e977c5ec2338bee94b2b98e986d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 28 Mar 2011 01:24:59 +0200 Subject: be sure this directory exist (lynx compile errror because of missing ncurses5-config) --- 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 ba0301159..02348c838 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -136,7 +136,7 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) endif ${STAGING_DIR} ${STAGING_DIR}/etc ${STAGING_HOST_DIR}: - mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/include,usr/lib/pkgconfig} \ + mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \ ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib} ${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc -- cgit v1.2.3 From 7ff3b1b184456af0fb948005ca7fe66d19e09e29 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 14:43:25 +0200 Subject: pass -flto to CXX compiler --- mk/vars.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk') diff --git a/mk/vars.mk b/mk/vars.mk index e5959f203..f2cea7b59 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -89,6 +89,7 @@ endif ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),) TARGET_CFLAGS+= -flto +TARGET_CXXFLAGS+= -flto TARGET_LDFLAGS+= -flto endif -- cgit v1.2.3 From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:20:09 +0200 Subject: Revert "fix conflict, autoseect libgcj" This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04. --- 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 e4b5866bc..02348c838 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -248,7 +248,7 @@ distclean: ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -477,7 +477,7 @@ distclean: ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR) @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG -- cgit v1.2.3 From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:21:13 +0200 Subject: I am to tupid for git, today. Revert "Revert "fix conflict, autoseect libgcj"" This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a. --- 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 02348c838..e4b5866bc 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -248,7 +248,7 @@ distclean: ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_HOST_DIR_PFX) $(TOOLS_BUILD_DIR) @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -477,7 +477,7 @@ distclean: ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(TOOLS_BUILD_DIR) @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG -- cgit v1.2.3 From eaacfc671c88663ff14a094e0190359a211b46e8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Apr 2011 16:20:55 +0200 Subject: only remove files from lowercase lists --- 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 ae0806669..635d8bc63 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -213,7 +213,7 @@ clean: @$(TRACE) clean $(MAKE) -C $(CONFIG) clean for d in ${STAGING_PKG_DIR}; do \ - for f in $$(ls $$d/[a-z]* 2>/dev/null); do \ + for f in $$(ls $$d/[a-z]*|grep -v [A-Z] 2>/dev/null); do \ while read file ; do \ rm ${STAGING_DIR}/$$file 2>/dev/null;\ done < $$f ; \ -- cgit v1.2.3 From 2bf604ffc3707110490658b3d2004da62767722b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 7 Apr 2011 14:11:08 +0200 Subject: update some packages after libpng15 update, misc stuff --- mk/package.mk | 7 ++++--- mk/pkg-bottom.mk | 2 +- mk/vars.mk | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index 4d8383388..0bb7ead83 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -183,7 +183,7 @@ ifeq (,$(filter noremove,$(7))) fi endif @rm -f '$${STAGING_PKG_DIR}/$(1)' - @-cd $${IDIR_$(1)}; \ + -@cd $${IDIR_$(1)}; \ x=$$$$(find tmp var -mindepth 1 2>/dev/null); if [[ -n $$$$x ]]; then \ echo 'WARNING: $${IPKG_$(1)} installs files into a' \ 'ramdisk location:' >&2; \ @@ -194,7 +194,7 @@ endif -exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi; \ find usr ! -type d 2>/dev/null | \ - grep -E -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/lib/pkgconfig' -e '^usr/bin/[a-z0-9-]+-config' | \ + grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ $(TOOLS_DIR)/cpio -padlmu '$${STAGING_DIR}' @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ @@ -230,7 +230,8 @@ ifeq (,$(filter noremove,$(7))) done <'$${STAGING_PKG_DIR}/$(1)'; \ fi endif - @rm -f '$${STAGING_PKG_DIR}/$(1)' + echo "Removing:" + rm -f '$${STAGING_PKG_DIR}/$(1)' $$(INFO_$(1)): $$(IPKG_$(1)) $(PKG_INSTALL) $$(IPKG_$(1)) diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index 49bae85f8..0735a8c14 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -172,7 +172,7 @@ endif -exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \ ' fix this!' >&2 \; -quit 2>/dev/null; fi;\ find usr ! -type d 2>/dev/null | \ - grep -E -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/lib/pkgconfig' -e '^usr/bin/[a-z0-9-]+-config' | \ + grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' -e '^/usr/lib/libpthread_nonshared.a' | \ tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \ $(TOOLS_DIR)/cpio -padlmu '${STAGING_DIR}' @cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \ diff --git a/mk/vars.mk b/mk/vars.mk index 7d15e1bc3..bb66a5e32 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -20,7 +20,7 @@ STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC} STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_* STAGING_JAVA_HOST_DIR:= ${BASE_DIR}/jhost # use headers and foo-config from system -ifneq ($(ADK_NATIVE),) +ifeq ($(ADK_NATIVE),y) STAGING_TARGET_DIR:= SCRIPT_TARGET_DIR:= /usr/bin else -- cgit v1.2.3 From 0c8fa8e61a481d2d25c55e20c0ebd5176375e623 Mon Sep 17 00:00:00 2001 From: wbx Date: Tue, 12 Apr 2011 19:21:40 +0200 Subject: refresh lemote yeelong support --- mk/build.mk | 2 +- mk/rootfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 635d8bc63..4774106ee 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -186,7 +186,7 @@ switch: kernelconfig: cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config $(BUILD_DIR)/linux/.config - ${KERNEL_MAKE_ENV} ${MAKE} ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig + ${KERNEL_MAKE_ENV} ${MAKE} ARCH=$(ARCH) ${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 diff --git a/mk/rootfs.mk b/mk/rootfs.mk index ee63d8c2d..2da69d017 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -27,7 +27,7 @@ endif $(eval $(call rootfs_template,cf,CF,$(ROOTFS))) $(eval $(call rootfs_template,mmc,MMC,$(ROOTFS))) -$(eval $(call rootfs_template,usb,USB,rootdelay=3)) +$(eval $(call rootfs_template,usb,USB,rootwait)) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) -- cgit v1.2.3