Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/freeradius-server/Makefile
	package/nss/patches/patch-mozilla_security_coreconf_Linux_mk

4 files changed, 10 insertions, 26 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 63fb13553..ea0adbb95 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -97,7 +97,6 @@ all: world
 ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
 	$(TOPDIR)/bin/tools/depmaker > ${TOPDIR}/package/Depends.mk
 
-
 .NOTPARALLEL:
 .PHONY: all world clean cleantarget cleandir distclean image_clean
 
@@ -461,9 +460,10 @@ bulk:
 		echo === building $$target $$libc $$fs on $$(date); \
 		$(GMAKE) prereq && \
 			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs defconfig; \
-			$(GMAKE) VERBOSE=1 all; \
+			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 		rm .config; \
 	    ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
+	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done <${TOPDIR}/target/bulkdef.lst
 
 bulktoolchain:
@@ -473,9 +473,10 @@ bulktoolchain:
 		echo === building $$target $$libc on $$(date); \
 		$(GMAKE) prereq && \
 			$(GMAKE) TARGET=$$target LIBC=$$libc defconfig; \
-			$(GMAKE) VERBOSE=1 all; \
+			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 		rm .config; \
 	    ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc.log; \
+	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done <${TOPDIR}/target/bulktool.lst
 
 bulkall:
@@ -485,9 +486,10 @@ bulkall:
 		echo === building $$target $$libc $$fs on $$(date); \
 		$(GMAKE) prereq && \
 			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allconfig; \
-			$(GMAKE) VERBOSE=1 all; \
+			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 		rm .config; \
 	    ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
+	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done <${TOPDIR}/target/bulk.lst
 
 bulkallmod:
@@ -497,9 +499,10 @@ bulkallmod:
 		echo === building $$target $$libc $$fs on $$(date); \
 		$(GMAKE) prereq && \
 			$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allmodconfig; \
-			$(GMAKE) VERBOSE=1 all; \
+			$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
 		rm .config; \
 	    ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
+	    if [ -f .exit ];then echo "Bulk build failed!"; rm .exit; exit 1;fi \
 	done <${TOPDIR}/target/bulk.lst
 
 ${TOPDIR}/bin/tools/pkgmaker:
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 14cee191d..03cb13fdb 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -56,7 +56,7 @@ endif
 ifeq ($(strip ${__use_generic_patch_target}),42)
 post-patch:
 ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done
-	[ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \
+	[ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches/${PKG_VERSION} \
 	    '{patch-!(*.orig),*.patch}' $(MAKE_TRACE)
 	[ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \
 	    '{patch-!(*.orig),*.patch}' $(MAKE_TRACE)
diff --git a/mk/modules.mk b/mk/modules.mk
index e88a90783..409c86910 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -361,13 +361,8 @@ $(eval $(call KMOD_template,NETFILTER_XT_TARGET_CLASSIFY,netfiler-xt-target-clas
 	$(MODULES_DIR)/kernel/net/netfilter/xt_CLASSIFY \
 ,50))
 
-ifeq ($(KERNEL_VERSION),2.6.35.4)
 CONNMARK:=xt_connmark
 MARK:=xt_mark
-else
-CONNMARK:=xt_CONNMARK
-MARK:=xt_MARK
-endif
 
 $(eval $(call KMOD_template,NETFILTER_XT_TARGET_CONNMARK,netfilter-xt-target-connmark,\
 	$(MODULES_DIR)/kernel/net/netfilter/$(CONNMARK) \
@@ -1225,12 +1220,7 @@ $(eval $(call KMOD_template,USB_HSO,usb-hso,\
 	$(MODULES_DIR)/kernel/drivers/net/usb/hso \
 ,75))
 
-ifeq ($(KERNEL_VERSION),2.6.35.4)
 SNDUSB:=snd-usbmidi-lib
-else
-SNDUSB:=snd-usb-lib
-endif
-
 $(eval $(call KMOD_template,SND_USB_AUDIO,snd-usb-audio,\
 	$(MODULES_DIR)/kernel/sound/usb/$(SNDUSB) \
 	$(MODULES_DIR)/kernel/sound/usb/snd-usb-audio \
diff --git a/mk/package.mk b/mk/package.mk
index db3007f71..915cea841 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -3,15 +3,6 @@
 
 all: build-all-pkgs
 
-ifneq (${PKG_CXX},)
-ifeq (${ADK_COMPILE_${PKG_CXX}_WITH_UCLIBCXX},y)
-PKG_BUILDDEP+=		uclibc++
-PKG_DEPENDS+=		uclibc++
-else
-PKG_DEPENDS+=		libstdcxx
-endif
-endif
-
 TCFLAGS:=		${TARGET_CFLAGS}
 TCXXFLAGS:=		${TARGET_CFLAGS}
 TCPPFLAGS:=		${TARGET_CPPFLAGS}
@@ -281,4 +272,4 @@ distclean: clean
 	rm -f ${FULLDISTFILES}
 
 .PHONY:	all refetch extract patch configure \
-	build fake package install clean build-all-pkgs
+	build rebuild fake package install clean build-all-pkgs