dev

dev@openadk.org

110 discussions

by lich000king

Hi After a break, I am trying to catch up on the brutefir performance test in adk. Unfortunately, with the current revision of adk (2af0538) I get a segmentation fault when running brutefir in offline mode. It can be reproduced by building qemu with brutefir and sox and then doing: cd /etc/ mkdir bftest cd bftest sox -t sl -r 44100 -c 2 /dev/zero -r 44100 -c 2 -b 16 pinknoise.wav synth 1:00 pinknoise vol 0.6 cat > wavtest.conf << "EOF" # Begin wavtest.conf # File used for testing brutefir # Uses dirac pulse als filter. # Stereo only. Input from file pinknoise.wav. Output to file output.wav. ## DEFAULT GENERAL SETTINGS ## float_bits: 32; # internal floating point precision sampling_rate: 44100; # sampling rate in Hz of audio interfaces filter_length: 4096,16; # length of filters # config_file: "/home/audiovero/.brutefir_config"; # standard location of main config file overflow_warnings: true; # echo warnings to stderr if overflow occurs show_progress: false; # echo filtering progress to stderr max_dither_table_size: 0; # maximum size in bytes of precalculated dither allow_poll_mode: false; # allow use of input poll mode modules_path: "/usr/lib/brutefir"; # extra path where to find BruteFIR modules monitor_rate: true; # monitor sample rate powersave: -80; # pause filtering when input is zero lock_memory: false; # try to lock memory if realtime prio is set convolver_config: "brutefir_convolver"; # location of convolver config file #benchmark: true; ## LOGIC ## logic: "cli" { port: 3000; }; ## COEFFS ## coeff "dirac" { filename: "dirac pulse"; format: "FLOAT64_LE"; }; ## INPUT, OUTPUT ## input "fleft", "fright" { device: "file" { path: "pinknoise.wav"; skip: 44;}; # ignore_xrun: true; }; sample: "S16_LE"; channels: 2/0,1; }; output "fr", "fl" { # device: "alsa" { device: "hw:0";}; # ignore_xrun: true; }; device: "file" { path: "output.wav"; }; sample: "S16_LE"; channels: 2/0,1; dither: true; }; ## FILTERS ## filter "frfilter" { from_inputs: "fright"; to_outputs: "fr"; coeff: "dirac"; }; filter "flfilter" { from_inputs: "fleft"; to_outputs: "fl"; coeff: "dirac"; }; # End wavtest.conf EOF brutefir -nodefault wavtest.conf which gives: "Generating random numbers...Segmentation fault" .config can be found here: https://mega.nz/#!5wp3QL6T!JtJxHTm8_wR5RGrDsxTSkUT6CuQD-nW3iNxvEDDfva0 uname -a on qemu: Linux openadk 4.4.50-1 #1 Sun Mar 12 19:58:04 CET 2017 x86_64 GNU/Linux The same thing happend also on my asus_p5bvm machine on revision 0c6a3bd. On earlier revisions of adk (see oder e-mails) the rest ran fine. I don't really see where this might be coming from. Any ideas or insights are welcome! :-) Cheers Oliver P.S. The config file was modified slightly to avoid the /data path, so the the test can be run from anywhere, now.

7 years, 2 months

[PATCH 15/15] Implement UBIFS rootfs support

by Phil Sutter

This implements UBIFS rootfs, enables it for mips targets and adds the necessary settings for rb532. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- mk/image.mk | 19 +++++++++++++++++++ mk/rootfs.mk | 1 + target/config/Config.in.rootfs | 9 +++++++++ target/linux/config/Config.in.flash | 23 ++++++++++++++++++++++- target/mips/Makefile | 8 ++++++++ 5 files changed, 59 insertions(+), 1 deletion(-) diff --git a/mk/image.mk b/mk/image.mk index 6b704f200938c..84d6ab9a80bd9 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -122,6 +122,7 @@ 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 ROOTFSJFFS2= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-jffs2.img +ROOTFSUBIFS= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-ubifs.img ROOTFSTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}+kernel.tar.xz ROOTFSUSERTARBALL= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}-${ADK_TARGET_FS}.tar.xz ROOTFSISO= ${ADK_TARGET_SYSTEM}-${ADK_TARGET_LIBC}.iso @@ -191,6 +192,24 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${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) +${FW_DIR}/${ROOTFSUBIFS}: ${TARGET_DIR} + ( \ + PATH='${HOST_PATH}'; \ + SP_SIZE='${ADK_TARGET_FLASH_SUBPAGE_SIZE}'; \ + PG_SZIE='${ADK_TARGET_FLASH_PAGE_SIZE}'; \ + LEB_SIZE=$$(((($$SP_SIZE + $$PG_SIZE) / $$PG_SIZE) * $$PG_SIZE)); \ + mkfs.ubifs -r ${TARGET_DIR} \ + -m $$PG_SIZE \ + -e $$((${ADK_TARGET_FLASH_PEB_SIZE} - $$LEB_SIZE)) \ + -c $$(((${ADK_TARGET_MTD_SIZE} / $$LEB_SIZE))) \ + -o ${FW_DIR}/rootfs.ubifs; \ + cd ${FW_DIR} && ubinize -o $@ \ + -p ${ADK_TARGET_FLASH_PEB_SIZE} \ + -m ${ADK_TARGET_FLASH_PAGE_SIZE} \ + -s ${ADK_TARGET_FLASH_SUBPAGE_SIZE} \ + "${ADK_TOPDIR}/target/${ADK_TARGET_ARCH}/${ADK_TARGET_SYSTEM}/ubinize.cfg"; \ + ) $(MAKE_TRACE) + createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list ${SED} 's/.*CONFIG_$RD_\|BLK_DEV_INITRD\|INITRAMFS_$.*//' \ ${LINUX_DIR}/.config diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 027c671b6b492..15489603654a5 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -58,6 +58,7 @@ $(eval $(call rootfs_template,initramfspiggyback,INITRAMFSPIGGYBACK,rootfstype=t $(eval $(call rootfs_template,initramfsarchive,INITRAMFSARCHIVE,rootfstype=tmpfs)) $(eval $(call rootfs_template,squashfs,SQUASHFS,$(MTDDEV) rootfstype=squashfs)) $(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV))) +$(eval $(call rootfs_template,ubifs,UBIFS,ubi.mtd=1 root=ubi0:rootfs rootfstype=ubifs)) $(eval $(call rootfs_template,jffs2,JFFS2,$(MTDDEV) rootfstype=jffs2)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index c24535f013617..335a4547f1303 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -87,6 +87,15 @@ config ADK_TARGET_ROOTFS_YAFFS help Root filesystem on NAND flash with YAFFS2. +config ADK_TARGET_ROOTFS_UBIFS + bool "UBIFS root filesystem (NAND)" + select ADK_KERNEL_UBIFS_FS + select ADK_HOST_NEED_MTD_UTILS + select ADK_HOST_NEED_KERNEL2MINOR + depends on ADK_TARGET_WITH_NAND + help + Root filesystem on NAND flash with UBI. + config ADK_TARGET_ROOTFS_NFSROOT bool "NFS root" select ADK_KERNEL_NETWORK_FILESYSTEMS diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 3cf3a15ffa480..159e4aa45a520 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -163,9 +163,30 @@ config ADK_TARGET_MTD_SIZE int depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ - || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 + || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \ + || ADK_TARGET_SYSTEM_MIKROTIK_RB532 default "16777216" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 + default "134217728" if ADK_TARGET_SYSTEM_MIKROTIK_RB532 default "0" +config ADK_TARGET_FLASH_PEB_SIZE + int + default 131072 if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + help + Physical Erase Block size. + +config ADK_TARGET_FLASH_PAGE_SIZE + int + default 2048 if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + help + Minimum input/output size. + +config ADK_TARGET_FLASH_SUBPAGE_SIZE + int + default 512 if ADK_TARGET_SYSTEM_MIKROTIK_RB532 + default ADK_TARGET_FLASH_PAGE_SIZE + help + Size of NAND sub-pages (if supported). + endmenu diff --git a/target/mips/Makefile b/target/mips/Makefile index bb30049f15619..6f0bd728c27ec 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -87,6 +87,11 @@ else @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' endif endif +ifeq ($(ADK_TARGET_FS),ubifs) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}' +endif # image creation and kernel install kernel-strip: @@ -121,3 +126,6 @@ endif ifeq ($(ADK_TARGET_FS),yaffs) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp endif +ifeq ($(ADK_TARGET_FS),ubifs) +imageinstall: $(FW_DIR)/$(ROOTFSUBIFS) targethelp +endif -- 2.9.3

7 years, 2 months

[PATCH 14/15] target/config: Allow targets to require kernel2minor host package

by Phil Sutter

Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- target/config/Config.in.tools | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index adff5da9859be..46a73c5422b43 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -242,6 +242,15 @@ config ADK_HOST_BUILD_MTD_UTILS default y if ADK_HOST_NEED_MTD_UTILS default n +config ADK_HOST_NEED_KERNEL2MINOR + bool + default n + +config ADK_HOST_BUILD_KERNEL2MINOR + bool + default y if ADK_HOST_NEED_KERNEL2MINOR + default n + config ADK_HOST_BUILD_PATCHELF bool default n -- 2.9.3

7 years, 2 months

[PATCH 13/15] Introduce kernel2minor package

by Phil Sutter

This is used to generate a yaffs2 filesystem image containing just the kernel binary as required by Mikrotik's rb532 board. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- package/kernel2minor/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/kernel2minor/Makefile diff --git a/package/kernel2minor/Makefile b/package/kernel2minor/Makefile new file mode 100644 index 0000000000000..e7ace1d6151f2 --- /dev/null +++ b/package/kernel2minor/Makefile @@ -0,0 +1,38 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= kernel2minor +PKG_VERSION:= 2cacb4dec6673a60a972a3a7f7629464a26a8492 +PKG_RELEASE:= 1 +PKG_GIT:= hash +PKG_DESCR:= kernel to Mikrotik NOR +PKG_SECTION:= sys/fs +PKG_URL:= https://github.com/adron-s/kernel2minor +PKG_SITES:= https://github.com/adron-s/kernel2minor.git + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,KERNEL2MINOR,kernel2minor,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,KERNEL2MINOR,kernel2minor,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +HOST_STYLE:= auto +HOST_CONFIG_STYLE:= manual +HOST_INSTALL_STYLE:= manual + +kernel2minor-hostinstall: + $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/sbin + $(INSTALL_BIN) $(WRKBUILD)/kernel2minor $(STAGING_HOST_DIR)/usr/sbin + +CONFIG_STYLE:= manual +INSTALL_STYLE:= manual + +kernel2minor-install: + $(INSTALL_DIR) $(IDIR_KERNEL2MINOR)/usr/sbin + $(INSTALL_BIN) $(WRKBUILD)/kernel2minor \ + $(IDIR_KERNEL2MINOR)/usr/sbin + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.9.3

7 years, 2 months

[PATCH 12/15] target/linux/config: Allow enabling UBIFS support

by Phil Sutter

Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- target/linux/config/Config.in.fs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 7c25754d1945c..b6226fc191c63 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -266,6 +266,20 @@ config ADK_KERNEL_YAFFS_FS help YAFFS2 filesystem for NAND devices +config ADK_KERNEL_MTD_UBI_GLUEBI + bool + +config ADK_KERNEL_MTD_UBI + tristate + select ADK_KERNEL_MTD + select ADK_KERNEL_MTD_UBI_GLUEBI + +config ADK_KERNEL_UBIFS_FS + tristate "UBIFS Filesystem" + select ADK_KERNEL_MTD_UBI + help + UBIFS is a file system for flash devices which works on top of UBI. + endmenu -- 2.9.3

7 years, 2 months

[PATCH 11/15] package/mtd-utils: Enable UBIFS support in host build

by Phil Sutter

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

7 years, 2 months

[PATCH 10/15] package/zlib: Enable host-package

by Phil Sutter

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

7 years, 2 months

[PATCH 09/15] mk/host-bottom: Introduce HOST_INSTALL_STYLE

by Phil Sutter

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

7 years, 2 months

[PATCH 08/15] mk/host-bottom: Introduce HOST_CONFIG_STYLE

by Phil Sutter

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

7 years, 2 months

[PATCH 07/15] target: Fix for incorrect post make instructions

by Phil Sutter

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

7 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

dev