From 1eccc1842e2c6a0bce4c448320341f1aef1683b7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 15 Aug 2011 12:12:44 +0200
Subject: cosmetic changes for jtools build

---
 mk/build.mk | 2 +-
 mk/vars.mk  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index cd50be90f..42ddebefb 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -266,7 +266,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
 include ${TOPDIR}/mk/vars.mk
 else
 include $(TOPDIR)/prereq.mk
-export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD
+export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD CXX_FOR_BUILD
 endif
 
 all: menuconfig
diff --git a/mk/vars.mk b/mk/vars.mk
index 3776b57b4..2c7e1259a 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -136,6 +136,7 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			CROSS='$(TARGET_CROSS)'
 
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
+			CXX_FOR_BUILD='${CXX_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
 			CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
 			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}'
-- 
cgit v1.2.3


From 36c4d46389c888b948448b34284af1d7dfd60508 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 15 Aug 2011 12:18:17 +0200
Subject: fix compile for arm target

---
 mk/build.mk | 2 +-
 mk/vars.mk  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index cd50be90f..854fdb19d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -266,7 +266,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
 include ${TOPDIR}/mk/vars.mk
 else
 include $(TOPDIR)/prereq.mk
-export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD
+export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU
 endif
 
 all: menuconfig
diff --git a/mk/vars.mk b/mk/vars.mk
index 3776b57b4..925635d01 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -47,6 +47,10 @@ TARGET_PATH=		${SCRIPT_DIR}:${TOOLS_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_
 REAL_GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
 GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux
 
+ifeq ($(CPU_ARCH),arm)
+QEMU:=			qemu-arm
+endif
+
 ifeq ($(ADK_NATIVE),y) 
 TARGET_CROSS:=
 TARGET_COMPILER_PREFIX?=
@@ -138,7 +142,8 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
 			CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
-			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}'
+			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \
+			QEMU='$(QEMU)'
 
 PKG_SUFFIX:=		$(strip $(subst ",, $(ADK_PACKAGE_SUFFIX)))
 
-- 
cgit v1.2.3


From a749a1f34e0fe6d22e9858494cffac021c0034cc Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 17 Aug 2011 05:39:08 +0200
Subject: revert CXX_FOR_BUILD stuff, breaks gcj compile

---
 mk/build.mk | 2 +-
 mk/vars.mk  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 3e5d92e6f..854fdb19d 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -266,7 +266,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
 include ${TOPDIR}/mk/vars.mk
 else
 include $(TOPDIR)/prereq.mk
-export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD CXX_FOR_BUILD QEMU
+export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU
 endif
 
 all: menuconfig
diff --git a/mk/vars.mk b/mk/vars.mk
index 893416ab2..925635d01 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -140,7 +140,6 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			CROSS='$(TARGET_CROSS)'
 
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
-			CXX_FOR_BUILD='${CXX_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
 			CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \
 			LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \
-- 
cgit v1.2.3


From 26020e730fb30663e7a4acfaa0ba0274d6cbf0eb Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 19 Aug 2011 18:10:35 +0200
Subject: remove  from image and kernel filenames. they are implicitely known.

---
 mk/image.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'mk')

diff --git a/mk/image.mk b/mk/image.mk
index 24e31aa0b..8053ba43d 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -65,12 +65,12 @@ kernel-package: $(KERNEL)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package
 	$(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE)
 
-TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-${CPU_ARCH}-${ADK_TARGET_FS}-kernel
-INITRAMFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
-ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
-ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
-ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
-INITRAMFS_PIGGYBACK=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_ARCH}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.cpio
+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
+ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
+ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+INITRAMFS_PIGGYBACK=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.cpio
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
-- 
cgit v1.2.3


From 9637f7746433e32ce710f0094aee29eea994195f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 19 Aug 2011 18:11:35 +0200
Subject: more qemu archs for OpenJDK

---
 mk/vars.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index 925635d01..d4f64d068 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -50,6 +50,15 @@ GNU_TARGET_NAME=	$(CPU_ARCH)-$(ADK_VENDOR)-linux
 ifeq ($(CPU_ARCH),arm)
 QEMU:=			qemu-arm
 endif
+ifeq ($(CPU_ARCH),mipsel)
+QEMU:=			qemu-mipsel
+endif
+ifeq ($(CPU_ARCH),i586)
+QEMU:=			qemu-i386
+endif
+ifeq ($(CPU_ARCH),i686)
+QEMU:=			qemu-i386
+endif
 
 ifeq ($(ADK_NATIVE),y) 
 TARGET_CROSS:=
-- 
cgit v1.2.3


From ea1aef3da3e68a062f28718a3e697b3148eef1fe Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 22 Aug 2011 06:31:02 +0200
Subject: allow FETCH_STYLE=manual to succeed. simplify fetch loop.

---
 mk/buildhlp.mk | 18 +++++++++++++++---
 mk/fetch.mk    |  7 -------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'mk')

diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 3c79fc1e8..19b761f46 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -49,15 +49,27 @@ ifeq (${_CHECKSUM_COOKIE},)
 endif
 ifeq ($(EXTRACT_OVERRIDE),1)
 	${MAKE} do-extract
-else	
+else
 	${EXTRACT_CMD}
 endif
 	@${MAKE} post-extract $(MAKE_TRACE)
 	touch $@
 
 __use_generic_patch_target:=42
-else ifeq ($(strip ${_IN_PACKAGE}),1)
-$(warning This package does not use the generic extraction and patch target; it's most likely to fail.)
+else
+include ${TOPDIR}/mk/fetch.mk
+${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE}
+	$(MAKE) fetch
+ifeq (${_CHECKSUM_COOKIE},)
+	rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
+endif
+ifeq ($(EXTRACT_OVERRIDE),1)
+	${MAKE} do-extract
+else
+	${EXTRACT_CMD}
+endif
+	@${MAKE} post-extract $(MAKE_TRACE)
+	touch $@
 endif
 
 ifeq ($(strip ${__use_generic_patch_target}),42)
diff --git a/mk/fetch.mk b/mk/fetch.mk
index 5c3edf918..a2590d467 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -59,14 +59,7 @@ endif
 define FETCH_template
 $(1):
 	@fullname='$(1)'; \
-	subname=$$$${fullname##$${DISTDIR}/}; \
 	filename=$$$${fullname##*/}; \
-	i='$${LOCAL_DISTDIR}'; \
-	if [[ -n $$$$i && -e $$$$i/$$$$subname ]]; then \
-		cd "$$$$i"; \
-		echo pax -rw "$$$$subname" '$${DISTDIR}/'; \
-		exec pax -rw "$$$$subname" '$${DISTDIR}/'; \
-	fi; \
 	mkdir -p "$$$${fullname%%/$$$$filename}"; \
 	cd "$$$${fullname%%/$$$$filename}"; \
 	for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \
-- 
cgit v1.2.3


From ce867d683d2e8414bf95c307a34dae9e4df21623 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 22 Aug 2011 08:40:05 +0200
Subject: implement submodel for foxboard lx. resolves duplicate full build for
 this systems

---
 mk/modules.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'mk')

diff --git a/mk/modules.mk b/mk/modules.mk
index c9819c697..e51732a4c 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1180,13 +1180,11 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\
 # USB
 #
 
-ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX832),)
-ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX416),)
+ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),)
 $(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 1430d117c0fcfc9f3b954ebce078745fb172a826 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 22 Aug 2011 09:59:55 +0200
Subject: enable x86_64

---
 mk/vars.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mk')

diff --git a/mk/vars.mk b/mk/vars.mk
index d4f64d068..89d78be83 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -59,6 +59,9 @@ endif
 ifeq ($(CPU_ARCH),i686)
 QEMU:=			qemu-i386
 endif
+ifeq ($(CPU_ARCH),x86_64)
+QEMU:=			qemu-x86_64
+endif
 
 ifeq ($(ADK_NATIVE),y) 
 TARGET_CROSS:=
-- 
cgit v1.2.3


From c39e8b5f6441ae3a9ba351bd5e3c2d31e0371415 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 24 Aug 2011 05:38:26 +0200
Subject: add qemu sparc support

---
 mk/image.mk | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'mk')

diff --git a/mk/image.mk b/mk/image.mk
index 8053ba43d..185164c22 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -65,12 +65,21 @@ kernel-package: $(KERNEL)
 	$(TRACE) target/$(ADK_TARGET_ARCH)-install-kernel-package
 	$(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE)
 
+ifeq ($(ADK_HARDWARE_QEMU),y)
+TARGET_KERNEL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_FS}-kernel
+INITRAMFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}
+ROOTFSSQUASHFS=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.img
+ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
+ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
+INITRAMFS_PIGGYBACK=	${ADK_TARGET_SYSTEM}-$(CPU_ARCH)-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.cpio
+else
 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
 ROOTFSTARBALL=		${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.gz
 ROOTFSUSERTARBALL=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.gz
 INITRAMFS_PIGGYBACK=	${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.cpio
+endif
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
-- 
cgit v1.2.3


From 0e930c133951dffe8c933fe02f67e72fec57dc8d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 24 Aug 2011 06:08:24 +0200
Subject: sync patch with OpenWrt, combine both targets (rb411/rb433)

---
 mk/rootfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mk')

diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 241a237fa..5080944e6 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -17,7 +17,7 @@ ROOTFS:=	root=/dev/sda2
 MTDDEV:=	root=/dev/mtdblock1
 endif
 
-ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB433),y)
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB4XX),y)
 MTDDEV:=	root=/dev/mtdblock2
 endif
 
-- 
cgit v1.2.3