dev

dev@openadk.org

115 discussions

[PATCH 11/15] package/mtd-utils: Enable UBIFS support in host build
by Phil Sutter 08 Mar '17

08 Mar '17

Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- package/mtd-utils/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/package/mtd-utils/Makefile b/package/mtd-utils/Makefile index ca8fac51f152a..cb5a69768f56d 100644 --- a/package/mtd-utils/Makefile +++ b/package/mtd-utils/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= flash filesystem utilities PKG_SECTION:= sys/fs PKG_DEPENDS:= libuuid liblzo PKG_BUILDDEP:= zlib util-linux liblzo -HOST_BUILDDEP:= liblzo-host +HOST_BUILDDEP:= liblzo-host zlib-host PKG_URL:= http://www.linux-mtd.infradead.org PKG_SITES:= ftp://ftp.infradead.org/pub/mtd-utils/ @@ -43,9 +43,10 @@ $(eval $(call PKG_template,FLASH_OTP_INFO,flash-otp-info,$(PKG_VERSION)-${PKG_RE $(eval $(call PKG_template,FLASH_OTP_DUMP,flash-otp-dump,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FLASH_OTP_DUMP},${PKG_SECTION})) $(eval $(call PKG_template,FLASH_LOCK,flash-lock,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FLASH_LOCK},${PKG_SECTION})) -HOST_STYLE:= manual +#HOST_STYLE:= manual +HOST_STYLE:= auto HOST_CPPFLAGS+= -DWITHOUT_XATTR=1 -I./include -HOST_MAKE_FLAGS+= WITHOUT_UBI=1 WITHOUT_LZO=1 +HOST_MAKE_FLAGS+= WITHOUT_LZO=1 host-build: (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ @@ -53,15 +54,16 @@ host-build: mtd-utils-hostinstall: ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin - ${INSTALL_BIN} ${WRKBUILD}/mkfs.jffs2 \ + ${INSTALL_BIN} ${WRKBUILD}/mkfs.{jffs2,ubifs} \ ${STAGING_HOST_DIR}/usr/bin XAKE_FLAGS+= WITHOUT_XATTR=1 +ifneq (${ADK_PACKAGE_MTD_UTILS_WITH_UBIFS},y) +XAKE_FLAGS+= WITHOUT_UBI=1 +else ifneq (${ADK_PACKAGE_MTD_UTILS_WITH_LZO},y) XAKE_FLAGS+= WITHOUT_LZO=1 endif -ifneq (${ADK_PACKAGE_MTD_UTILS_WITH_UBIFS},y) -XAKE_FLAGS+= WITHOUT_UBI=1 endif XAKE_FLAGS+= BUILDDIR="${WRKDIST}" -- 2.9.3

1 0

[PATCH 10/15] package/zlib: Enable host-package
by Phil Sutter 08 Mar '17

08 Mar '17

Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- package/zlib/Makefile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 2da7e98bfb4d9..7f0c0ce1e4a79 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -13,10 +13,33 @@ PKG_URL:= http://www.zlib.net/ PKG_SITES:= http://zlib.net/ PKG_OPTS:= dev +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +HOST_STYLE:= auto +HOST_CONFIG_STYLE:= manual +HOST_CONFIGURE_ENV+= uname=Linux +HOST_ALL_TARGET:= libz.so.$(PKG_VERSION) + +host-configure: + (cd $(WRKBUILD); \ + uname="Linux" \ + $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -fPIC" \ + CPPFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_HOST_DIR)/usr/lib" \ + ./configure \ + --prefix=/usr \ + --shared \ + ); + +#zlib-hostinstall: +# $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/lib +# $(CP) $(WRKBUILD)/libz.so* $(STAGING_HOST_DIR)/usr/lib + CONFIG_STYLE:= manual CONFIGURE_ENV+= uname=Linux @@ -47,4 +70,5 @@ zlib-install: $(INSTALL_DIR) $(IDIR_ZLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libz.so* $(IDIR_ZLIB)/usr/lib +include ${ADK_TOPDIR}/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.9.3

1 0

[PATCH 09/15] mk/host-bottom: Introduce HOST_INSTALL_STYLE
by Phil Sutter 08 Mar '17

08 Mar '17

This is helpful when a package could use HOST_STYLE=auto but doesn't provide an install target. In that case, one can now set | HOST_STYLE=auto | HOST_CONFIG_STYLE=manual and define a custom host-install target while still making use of the auto targets for anything else. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- mk/host-bottom.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 21a28a0511900..a8f6db773efc3 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -84,20 +84,22 @@ endif ${MAKE} host-build $(MAKE_TRACE) touch $@ +HOST_INSTALL_STYLE?= ${HOST_STYLE} + hostpost-install: host-install: ${ALL_HOSTINST} ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} @$(CMD_TRACE) "installing.. " @mkdir -p ${HOST_WRKINST} -ifeq (${HOST_STYLE},) +ifeq (${HOST_INSTALL_STYLE},) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif -ifeq (${HOST_STYLE},auto) +ifeq (${HOST_INSTALL_STYLE},auto) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${STAGING_HOST_DIR}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif -ifeq (${HOST_STYLE},manual) +ifeq (${HOST_INSTALL_STYLE},manual) env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE) endif env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE) -- 2.9.3

1 0

[PATCH 08/15] mk/host-bottom: Introduce HOST_CONFIG_STYLE
by Phil Sutter 08 Mar '17

08 Mar '17

This is helpful when a package could use HOST_STYLE=auto but doesn't ship a conforming configure script. In that case, one can now set | HOST_STYLE=auto | HOST_CONFIG_STYLE=manual and define a custom host-configure target while still making use of the auto targets for anything else. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- mk/host-bottom.mk | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 6fcd78e8846bd..21a28a0511900 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -3,6 +3,8 @@ host-extract: ${_HOST_PATCH_COOKIE} +HOST_CONFIG_STYLE?= ${HOST_STYLE} + hostpre-configure: host-configure: ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} @@ -17,7 +19,7 @@ ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) @touch ${WRKDIR}/.autoreconf_done endif @${MAKE} hostpre-configure $(MAKE_TRACE) -ifeq (${HOST_STYLE},) +ifeq (${HOST_CONFIG_STYLE},) @$(CMD_TRACE) "configuring.. " cd ${WRKBUILD}; \ env ${HOST_CONFIGURE_ENV} \ @@ -31,7 +33,7 @@ ifeq (${HOST_STYLE},) --sysconfdir=${STAGING_HOST_DIR}/etc \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) endif -ifeq (${HOST_STYLE},auto) +ifeq (${HOST_CONFIG_STYLE},auto) @$(CMD_TRACE) "configuring.. " cd ${WRKBUILD}; \ env ${HOST_CONFIGURE_ENV} \ @@ -51,13 +53,13 @@ ifeq (${HOST_STYLE},auto) --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) endif -ifeq (${HOST_STYLE},cmake) +ifeq (${HOST_CONFIG_STYLE},cmake) @$(CMD_TRACE) "configuring cmake.. " cd ${WRKBUILD}; PATH='${HOST_PATH}' \ cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ ${HOST_CMAKE_FLAGS} ${WRKSRC} $(MAKE_TRACE) endif -ifeq (${HOST_STYLE},perl) +ifeq (${HOST_CONFIG_STYLE},perl) @$(CMD_TRACE) "configuring perl module.. " cd ${WRKBUILD}; \ PATH='${HOST_PATH}' \ @@ -66,7 +68,7 @@ ifeq (${HOST_STYLE},perl) $(HOST_PERL_ENV) \ perl-host Makefile.PL ${HOST_CONFIGURE_ARGS} endif -ifeq (${HOST_STYLE},manual) +ifeq (${HOST_CONFIG_STYLE},manual) @$(CMD_TRACE) "configuring.. " ${MAKE} host-configure $(MAKE_TRACE) endif -- 2.9.3

1 0

[PATCH 07/15] target: Fix for incorrect post make instructions
by Phil Sutter 08 Mar '17

08 Mar '17

Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- target/x86/Makefile | 3 ++- target/x86_64/Makefile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/x86/Makefile b/target/x86/Makefile index 3ff21095ad265..b47da2b423a68 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -90,10 +90,11 @@ endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: @echo "The disk image is: $(FW_DIR)/disk.img" - @echo "Use following command to install it on SD card:" ifeq ($(ADK_TARGET_QEMU),y) + @echo "Start qemu with following command line:" @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img' else + @echo "Use following command to install it on SD card:" @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' endif endif diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index e4b53e1b0b98e..654ab02471291 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -91,6 +91,7 @@ ifeq ($(ADK_TARGET_FS),genimage) targethelp: @echo "The disk image is: $(FW_DIR)/disk.img" ifeq ($(ADK_TARGET_QEMU),y) + @echo "Start qemu with following command line:" @echo 'qemu-system-${QEMU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img' else @echo "Use following command to install it on SD card:" -- 2.9.3

1 0

[PATCH 06/15] mk/image.mk: Fix calling mkfs.jffs2
by Phil Sutter 08 Mar '17

08 Mar '17

This command does not reside in ${STAGING_HOST_DIR}/usr/bin (anymore?), also setting PATH='${HOST_PATH}' prior to just calling the command without path is more elegant in my opinion. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- mk/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/image.mk b/mk/image.mk index e0851418e4c8c..6b704f200938c 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -188,7 +188,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}/.adk -nopad -noappend -root-owned $(MAKE_TRACE) ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} - ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \ + PATH='${HOST_PATH}' mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list -- 2.9.3

1 0

[PATCH 05/15] package/grub: Fix grub.cfg
by Phil Sutter 08 Mar '17

08 Mar '17

When trying qemu-x86_64 target with full disk image, grub wasn't able to read the rootfs. After comparing it's config with the one used on my notebook, I was able to get it right. Apart from fixing the failure, this also enables serial output so grub menu becomes accessible when calling qemu with -nographic option. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- package/grub/files/grub.cfg | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/grub/files/grub.cfg b/package/grub/files/grub.cfg index d87a52cacced4..8d20ab2435180 100644 --- a/package/grub/files/grub.cfg +++ b/package/grub/files/grub.cfg @@ -1,8 +1,14 @@ +serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 +terminal_input serial +terminal_output serial + set default=0 set timeout=3 menuentry "OpenADK" { + insmod part_msdos + insmod ext2 + set root='hd0,msdos1' echo "Loading OpenADK" - set root=(hd0,2) - linux (hd0,2)/boot/kernel root=/dev/sda2 rootfstype=ext4 rootwait panic=10 + linux16 /boot/kernel root=/dev/sda1 rootfstype=ext4 rootwait panic=10 } -- 2.9.3

1 0

[PATCH 04/15] target: ADK_TARGET_ROOTFS_GENIMAGE fails without ADK_TARGET_QEMU_WITH_BOOTLOADER
by Phil Sutter 08 Mar '17

08 Mar '17

Therefore make the former select the latter. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- target/config/Config.in.rootfs | 1 + 1 file changed, 1 insertion(+) diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 096293e45f1b5..c24535f013617 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -163,6 +163,7 @@ config ADK_TARGET_ROOTFS_GENIMAGE select ADK_KERNEL_EXT4_FS select ADK_KERNEL_VFAT_FS select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU + select ADK_TARGET_QEMU_WITH_BOOTLOADER if ADK_TARGET_QEMU select ADK_HOST_BUILD_GENIMAGE help Create a complete disk image for the target with genimage. -- 2.9.3

1 0

[PATCH 03/15] toolchain: gcc: 5.4.0: fix patch formatting
by Phil Sutter 08 Mar '17

08 Mar '17

git-am is quite picky when it comes to commit messages, this one needed fixing. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- toolchain/gcc/patches/5.4.0/microblaze-enable-dwarf-eh-support.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/gcc/patches/5.4.0/microblaze-enable-dwarf-eh-support.patch b/toolchain/gcc/patches/5.4.0/microblaze-enable-dwarf-eh-support.patch index 9d29090a2a876..b9ad32fe8311d 100644 --- a/toolchain/gcc/patches/5.4.0/microblaze-enable-dwarf-eh-support.patch +++ b/toolchain/gcc/patches/5.4.0/microblaze-enable-dwarf-eh-support.patch @@ -1,5 +1,3 @@ -Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc - From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" <edgar.iglesias(a)gmail.com> Date: Mon, 18 Jun 2012 20:18:13 +0200 @@ -26,6 +24,8 @@ Changelog Signed-off-by: David Holsgrove <david.holsgrove(a)xilinx.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias(a)gmail.com> --- +Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc +--- gcc/common/config/microblaze/microblaze-common.c | 3 --- gcc/config/microblaze/microblaze-protos.h | 1 + gcc/config/microblaze/microblaze.c | 29 ++++++++++++++++++++---- -- 2.9.3

1 0

[PATCH 02/15] package/asterisk: Fix build
by Phil Sutter 08 Mar '17

08 Mar '17

Looks like there is a bug in AST_INLINE_API macro voodoo. Fix taken from here: https://issues.asterisk.org/jira/browse/ASTERISK-25503 Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- package/asterisk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 3367cce949014..2504e1abc0644 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -111,7 +111,7 @@ INSTALL_STYLE:= manual TARGET_CFLAGS+= -fgnu89-inline TARGET_LDFLAGS+= -lm -ltinfo -ldl -lpthread MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ - ASTLDFLAGS="${TARGET_LDFLAGS}" + ASTLDFLAGS="${TARGET_LDFLAGS} -z muldefs" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_CFLAGS}" \ NOISY_BUILD=1 -- 2.9.3

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

dev