From 96b22f101eb53be683212f7fd4c61c8f16bbe283 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 16 Jan 2014 20:51:37 +0100 Subject: fix krb5 cross-compile, bison use M4 env --- mk/package.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index 24ef42594..da04288c1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -49,6 +49,7 @@ INSTALL_TARGET?= install MAKE_ENV+= $(GCC_CHECK) \ PATH='${TARGET_PATH}' \ LIBTOOLIZE='${STAGING_HOST_DIR}/usr/bin/libtoolize -q' \ + M4='${STAGING_HOST_DIR}/usr/bin/m4' \ WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ WRKSRC='${WRKSRC}' WRKBUILD='${WRKBUILD}' \ CFLAGS='$(strip ${TARGET_CFLAGS})' \ -- cgit v1.2.3 From c9e26ba32e24b2a84ec1978d49c53187e99a086c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 17 Jan 2014 18:28:58 +0100 Subject: reorganize nfs package, add nfs client and server subpackages --- mk/modules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index bb84317de..fb7044457 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1106,7 +1106,7 @@ $(eval $(call KMOD_template,LOCKD,lockd,\ ifneq ($(ADK_KERNEL_NFS_FS),y) $(eval $(call KMOD_template,NFS_FS,nfs-fs,\ $(MODULES_DIR)/kernel/fs/nfs/nfs \ -,30)) +,30, kmod-sunrpc)) endif #$(eval $(call KMOD_template,EXPORTFS,exportfs,\ -- cgit v1.2.3 From c5d0baec6d29ecf3fe73855c31867b56ca00f30f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 18 Jan 2014 13:49:50 +0100 Subject: disable heimdal for release/bulk builds, conflicts with krb5, nfs-utils fail to rebuild --- mk/build.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 9242cc27a..86bb4bfcb 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -22,6 +22,8 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_E2FSCK_STATIC=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_INSTALLER=n \ + ADK_PACKAGE_HEIMDAL_SERVER=n \ + ADK_PACKAGE_LIBHEIMDAL=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ -- cgit v1.2.3 From eaea3cb19fdb33ff904216d8a6b6d00fe3164dbb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 21 Jan 2014 08:32:16 +0100 Subject: add dependency kernel module --- mk/modules.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index fb7044457..62d1abd45 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1092,6 +1092,7 @@ $(eval $(call KMOD_template,SUNRPC,sunrpc,\ ,24)) $(eval $(call KMOD_template,SUNRPC_GSS,sunrpc-gss,\ + $(MODULES_DIR)/kernel/lib/oid_registry \ $(MODULES_DIR)/kernel/net/sunrpc/auth_gss/auth_rpcgss \ ,25)) -- cgit v1.2.3 From e73de827e71240d6e720487c48491d8193b2a15d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 23 Jan 2014 07:35:33 +0100 Subject: add alsa hrtimer for rpi, fix some dependency bugs after the switch to miniconfig --- mk/modules.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index 62d1abd45..ef4870dd1 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1163,10 +1163,14 @@ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) +$(eval $(call KMOD_template,SND_HRTIMER,snd-hrtimer,\ + $(MODULES_DIR)/kernel/sound/core/snd-hrtimer \ +,41)) + $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ -,41)) +,42)) $(eval $(call KMOD_template,SND_OSSEMUL,snd-ossemul,\ $(MODULES_DIR)/kernel/sound/core/oss/snd-mixer-oss \ -- cgit v1.2.3 From 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 23 Jan 2014 08:12:50 +0100 Subject: remove jtools/java host dir. use host stuff instead. fix arm building. --- mk/build.mk | 20 ++++++++------------ mk/vars.mk | 2 -- 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 986d66cd7..5286212ce 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -26,7 +26,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ - ADK_PACKAGE_OPENJDK7=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_CRYPTINIT=n \ @@ -152,12 +151,12 @@ ifeq ($(ADK_NATIVE),y) else ifeq ($(ADK_TOOLCHAIN),y) ifeq ($(ADK_TOOLCHAIN_ONLY),y) - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile + $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile else - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install + $(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile root_clean package/install endif else - $(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index + $(MAKE) -f mk/build.mk toolchain/fixup tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index endif endif @@ -189,9 +188,6 @@ toolchain/%: ${STAGING_DIR} tools/%: $(MAKE) -C tools $(patsubst tools/%,%,$@) -jtools/%: - $(MAKE) -C jtools $(patsubst jtools/%,%,$@) - image: $(MAKE) -C target image @@ -272,7 +268,7 @@ cleandir: rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \ ${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) $(JTOOLS_BUILD_DIR) $(STAGING_JAVA_HOST_DIR) + rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) rm -f .menu .tmpconfig.h .rebuild* ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk cleantarget: @@ -286,9 +282,9 @@ distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR) + ${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) $(STAGING_JAVA_HOST_DIR) + @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ .menu ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* @@ -534,9 +530,9 @@ _mconfig2: ${CONFIG}/conf modconfig .menu distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/package/pkglist.d ${TOPDIR}/package/pkgconfigs.d $(JTOOLS_BUILD_DIR) + ${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) $(STAGING_JAVA_HOST_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 \ .menu .rebuild.* ${TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG diff --git a/mk/vars.mk b/mk/vars.mk index 657d44ae5..fcd22a5e6 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -18,7 +18,6 @@ STAGING_PKG_DIR:= ${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_ STAGING_PKG_DIR_PFX:= ${BASE_DIR}/pkg_* STAGING_HOST_DIR:= ${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC} STAGING_HOST_DIR_PFX:= ${BASE_DIR}/host_* -STAGING_JAVA_HOST_DIR:= ${BASE_DIR}/jhost # use headers and foo-config from system ifeq ($(ADK_NATIVE),y) STAGING_TARGET_DIR:= @@ -35,7 +34,6 @@ STAGING_HOST2TARGET:= ../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LI TOOLCHAIN_BUILD_DIR= $(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC} TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_* TOOLS_BUILD_DIR= $(BASE_DIR)/tools_build -JTOOLS_BUILD_DIR= $(BASE_DIR)/jtools_build TOOLS_DIR:= $(BASE_DIR)/bin/tools SCRIPT_DIR:= $(BASE_DIR)/scripts BIN_DIR:= $(BASE_DIR)/bin/${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC} -- cgit v1.2.3 From 53d5800eb6fb9431f61c2e0941efcd1a20ce2b4a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 24 Jan 2014 12:13:26 +0100 Subject: higher timeout for slow proxies --- 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 e217a9dca..617316e29 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -218,7 +218,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=5 -t 3 $(QUIET) +FETCH_CMD?= wget --timeout=10 -t 3 $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe -- cgit v1.2.3 From 54419b88b5b9590e26dbf50b2985f9d0cca2fbb2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 25 Jan 2014 20:58:58 +0100 Subject: fix clang warning --- 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 617316e29..23cc018f0 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -118,7 +118,7 @@ endif # A nifty macro to make testing gcc features easier (from uClibc project) check_gcc=$(shell \ - if $(CC_FOR_BUILD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ + if $(CC_FOR_BUILD) $(1) -Werror -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \ then echo "$(1)"; else echo "$(2)"; fi) CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) -- cgit v1.2.3 From 4a138d957f7a3031cbe43b693fba4aa4647259fd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 26 Jan 2014 00:35:05 +0100 Subject: highres timer breaks pulseaudio rtp stream sync on raspberry pi --- mk/modules.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'mk') diff --git a/mk/modules.mk b/mk/modules.mk index ef4870dd1..d959d7453 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1163,10 +1163,6 @@ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ ,40)) -$(eval $(call KMOD_template,SND_HRTIMER,snd-hrtimer,\ - $(MODULES_DIR)/kernel/sound/core/snd-hrtimer \ -,41)) - $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \ -- cgit v1.2.3