From f01840ed2ad30945ca6d510f433a7dfab6db157a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 1 Apr 2014 11:25:55 +0200 Subject: fix typo --- package/adk-helper/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/adk-helper/Makefile b/package/adk-helper/Makefile index 7d0ccb202..d386bd508 100644 --- a/package/adk-helper/Makefile +++ b/package/adk-helper/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_DESCR:= adk helper utilities PKG_SECTION:= misc -PKG_CFLINE_MKCRYPT:= depends on ADK_HOST_ONLY +PKG_CFLINE_ADK_HELPER:= depends on ADK_HOST_ONLY NO_DISTFILES:= 1 -- cgit v1.2.3 From a691abc857458de0023f5e532feee866af0218ed Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Apr 2014 07:36:44 +0200 Subject: add symlink --- package/pkgconf/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile index b1131003a..8375a8236 100644 --- a/package/pkgconf/Makefile +++ b/package/pkgconf/Makefile @@ -24,6 +24,7 @@ HOST_STYLE:= auto hostpost-install: (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf pkg-config) + (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkgconf $(GNU_TARGET_NAME)-pkg-config) pkgconf-install: $(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin -- cgit v1.2.3 From 98a4d7f53119697858540612e7ef86ea6732b8c3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Apr 2014 07:38:36 +0200 Subject: fix host build depends for mtd-utils/squashfs --- package/squashfs/Makefile | 1 + target/config/Config.in | 2 -- target/config/Config.in.tools | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) (limited to 'package') diff --git a/package/squashfs/Makefile b/package/squashfs/Makefile index 575849acd..8478f6c57 100644 --- a/package/squashfs/Makefile +++ b/package/squashfs/Makefile @@ -8,6 +8,7 @@ PKG_VERSION:= 4.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 1b7a781fb4cf8938842279bd3e8ee852 PKG_DESCR:= squashfs filesystem utilities +HOST_BUILDDEP:= xz-host PKG_SECTION:= fs PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=squashfs/} diff --git a/target/config/Config.in b/target/config/Config.in index 498c5d9e4..333664aea 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -270,8 +270,6 @@ config ADK_TARGET_QEMU_WITH_BLOCK select ADK_KERNEL_SCSI_IBMVSCSI if ADK_TARGET_SYSTEM_QEMU_PPC64 select ADK_KERNEL_SCSI_SUNESP if ADK_TARGET_SYSTEM_QEMU_SPARC select ADK_KERNEL_PATA_PLATFORM if ADK_LINUX_SH - select ADK_HOST_NEED_JFFS2 if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 - select ADK_HOST_NEED_SQUASHFS if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 || ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 endchoice diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 2159b4db7..95e4f6d63 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -106,16 +106,31 @@ config ADK_HOST_BUILD_SYSLINUX default n # optional, must be used from OpenADK +config ADK_HOST_NEED_MTD_UTILS + boolean + default n + config ADK_HOST_BUILD_MTD_UTILS + boolean + default y if ADK_HOST_NEED_MTD_UTILS + default n + +config ADK_HOST_NEED_SQUASHFS boolean default n config ADK_HOST_BUILD_SQUASHFS + boolean + default y if ADK_HOST_NEED_SQUASHFS + default n + +config ADK_HOST_NEED_MKIMAGE boolean default n config ADK_HOST_BUILD_MKIMAGE boolean + default y if ADK_HOST_NEED_MKIMAGE default n config ADK_HOST_BUILD_PCRE -- cgit v1.2.3 From c3553006efab78a3e68220e2c0c18e20b91e8af7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 2 Apr 2014 17:53:35 +0200 Subject: update to latest stable version --- package/qemu/Makefile | 14 ++++++++------ package/qemu/patches/patch-linux-user_syscall_c | 16 ++++++++++------ package/qemu/patches/patch-util_qemu-openpty_c | 11 +++++++++++ 3 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 package/qemu/patches/patch-util_qemu-openpty_c (limited to 'package') diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 4c2067ac9..6ca93afa3 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -4,13 +4,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:= qemu -PKG_VERSION:= 1.7.0 +PKG_VERSION:= 1.7.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 32893941d40d052a5e649efcf06aca06 +PKG_MD5SUM:= 9541063d999cf9659ed7fdce71314f31 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc -PKG_DEPENDS:= zlib libsdl libpng -PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host qemu-host zlib sdl libpng +PKG_DEPENDS:= zlib glib +PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host +PKG_BUILDDEP+= qemu-host zlib glib PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -24,17 +25,18 @@ include $(TOPDIR)/mk/package.mk $(eval $(call HOST_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,QEMU,qemu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -TARGET_LDFLAGS+= -pthread -lm -lrt CONFIG_STYLE:= minimal CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ + --cross-prefix=$(GNU_TARGET_NAME)- \ --prefix=/usr \ --sysconfdir=/etc \ --enable-kvm \ --disable-docs \ + --disable-sdl \ --bindir=/usr/bin HOST_STYLE:= manual +CFLAGS_FOR_BUILD+= -DNATIVE HOST_CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ --disable-docs \ --disable-werror \ diff --git a/package/qemu/patches/patch-linux-user_syscall_c b/package/qemu/patches/patch-linux-user_syscall_c index 1eba70417..aa243b148 100644 --- a/package/qemu/patches/patch-linux-user_syscall_c +++ b/package/qemu/patches/patch-linux-user_syscall_c @@ -1,21 +1,25 @@ ---- qemu-1.7.0.orig/linux-user/syscall.c 2013-11-27 23:15:55.000000000 +0100 -+++ qemu-1.7.0/linux-user/syscall.c 2014-01-31 09:51:34.051058876 +0100 -@@ -64,6 +64,7 @@ int __clone2(int (*fn)(void *), void *ch +--- qemu-1.7.1.orig/linux-user/syscall.c 2014-03-25 15:01:10.000000000 +0100 ++++ qemu-1.7.1/linux-user/syscall.c 2014-04-02 16:56:13.483513278 +0200 +@@ -63,6 +63,7 @@ int __clone2(int (*fn)(void *), void *ch + //#include #include #include - #include +#include + #include #include #include "qemu-common.h" - #ifdef TARGET_GPROF -@@ -94,7 +95,11 @@ int __clone2(int (*fn)(void *), void *ch +@@ -94,7 +95,15 @@ int __clone2(int (*fn)(void *), void *ch #include #include #include ++#ifdef NATIVE +#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,11,0) #include +#else +#include ++#endif ++#else ++#include +#endif #include #include diff --git a/package/qemu/patches/patch-util_qemu-openpty_c b/package/qemu/patches/patch-util_qemu-openpty_c new file mode 100644 index 000000000..ed524628a --- /dev/null +++ b/package/qemu/patches/patch-util_qemu-openpty_c @@ -0,0 +1,11 @@ +--- qemu-1.7.0.orig/util/qemu-openpty.c 2013-11-27 23:15:55.000000000 +0100 ++++ qemu-1.7.0/util/qemu-openpty.c 2014-03-14 09:05:17.280258135 +0100 +@@ -35,7 +35,7 @@ + #include "config-host.h" + #include "qemu-common.h" + +-#if defined(__GLIBC__) ++#if defined(__linux__) + # include + #elif defined CONFIG_BSD + # include -- cgit v1.2.3 From 97f06c7f9d934a86f84f6608bcf3c6a1a1132eee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Apr 2014 11:27:38 +0200 Subject: add qemu host dependency --- package/qemu/Makefile | 20 +++++++++++--------- scripts/scan-tools.sh | 6 ++++++ target/config/Config.in | 1 + target/config/Config.in.tools | 8 ++++++++ target/microblaze/Makefile | 2 +- 5 files changed, 27 insertions(+), 10 deletions(-) (limited to 'package') diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 6ca93afa3..a43560a74 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -10,8 +10,9 @@ PKG_MD5SUM:= 9541063d999cf9659ed7fdce71314f31 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc PKG_DEPENDS:= zlib glib -PKG_BUILDDEP:= gettext-tiny libiconv-tiny glib-host -PKG_BUILDDEP+= qemu-host zlib glib +PKG_BUILDDEP:= gettext-tiny libiconv-tiny +PKG_BUILDDEP+= zlib glib +HOST_BUILDDEP:= glib-host PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -35,9 +36,10 @@ CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ --disable-sdl \ --bindir=/usr/bin -HOST_STYLE:= manual CFLAGS_FOR_BUILD+= -DNATIVE +HOST_STYLE:= manual HOST_CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ + --prefix=${STAGING_HOST_DIR}/usr \ --disable-docs \ --disable-werror \ --disable-system \ @@ -45,17 +47,17 @@ HOST_CONFIGURE_ARGS+= --host-cc=$(CC_FOR_BUILD) \ host-configure: cd ${WRKBUILD}; rm -f config.{cache,status}; \ - env ${HOST_CONFIGURE_ENV} \ - ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ - ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) + env ${HOST_CONFIGURE_ENV} \ + ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ + ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) host-build: cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) - + ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) + qemu-hostinstall: cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - DESTDIR='$(STAGING_HOST_DIR)' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) + ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) qemu-install: $(INSTALL_DIR) $(IDIR_QEMU)/usr/share/qemu diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 16b13d4e3..ee8d8a3ff 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -295,6 +295,11 @@ if ! which lzop >/dev/null 2>&1; then host_build_lzop=1 fi +host_build_qemu=0 +if ! which qemu-img >/dev/null 2>&1; then + echo "No qemu found, will build one when required." + host_build_qemu=1 +fi echo "config ADK_HOST_BUILD_TOOLS" > $topdir/target/config/Config.in.prereq printf "\t%s\n" "boolean" >> $topdir/target/config/Config.in.prereq @@ -314,6 +319,7 @@ if [ $host_build_ccache -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CCAC if [ $host_build_genext2fs -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GENEXT2FS if ADK_HOST_NEED_GENEXT2FS" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzma -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZMA if ADK_HOST_NEED_LZMA" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzop -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZOP if ADK_HOST_NEED_LZOP" >> $topdir/target/config/Config.in.prereq ;fi +if [ $host_build_qemu -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_QEMU if ADK_HOST_NEED_QEMU" >> $topdir/target/config/Config.in.prereq ;fi cd $topdir rm -rf tmp diff --git a/target/config/Config.in b/target/config/Config.in index 1255ceae3..501039ed1 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -771,6 +771,7 @@ config ADK_TARGET_ROOTFS_SQUASHFS bool "Compressed read-only root filesystem (squashfs)" select ADK_KERNEL_SQUASHFS select ADK_HOST_NEED_SQUASHFS + select ADK_HOST_NEED_QEMU if ADK_HARDWARE_QEMU select ADK_TARGET_QEMU_WITH_BLOCK if ADK_HARDWARE_QEMU depends on ADK_TARGET_WITH_MTD help diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 95e4f6d63..f95a4508b 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -97,6 +97,14 @@ config ADK_HOST_BUILD_MKSH boolean default n +config ADK_HOST_NEED_QEMU + boolean + default n + +config ADK_HOST_BUILD_QEMU + boolean + default n + config ADK_HOST_NEED_SYSLINUX boolean default n diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 58d02c5be..4a39e1c3b 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -18,7 +18,7 @@ endif ifeq ($(ADK_TARGET_FS),squashfs) imageinstall: $(BUILD_DIR)/root.squashfs - qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) + env PATH=$(HOST_PATH) qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) ifneq ($(ADK_HARDWARE_QEMU),) -- cgit v1.2.3