From dde56373e0193233bf9a9b191681d0036056f875 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 21 Mar 2014 20:26:27 +0100 Subject: add msmtp --- TODO | 1 + 1 file changed, 1 insertion(+) (limited to 'TODO') diff --git a/TODO b/TODO index 6b54af848..3cdf527a0 100644 --- a/TODO +++ b/TODO @@ -17,5 +17,6 @@ - evaluate libguestfs for image creation - check for gcc and SSP again - port w3m +- port msmtp - rutorrent porting - lms perl -- cgit v1.2.3 From 245336100e42a050809afd700a1b26e21b39466e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 10:32:21 +0100 Subject: fix jffs2 boot for qemu-microblaze, CMDLINE_FORCE required --- BUGS | 2 +- TODO | 2 ++ mk/build.mk | 2 +- mk/image.mk | 2 +- target/linux/config/Config.in.spi | 6 ++++++ target/microblaze/kernel/qemu-microblaze-ml605 | 1 + target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 1 + 7 files changed, 13 insertions(+), 3 deletions(-) (limited to 'TODO') diff --git a/BUGS b/BUGS index 70759ad05..38c61307f 100644 --- a/BUGS +++ b/BUGS @@ -2,4 +2,4 @@ - qemu-sh4: usb keyboard is broken - qemu-arm: thumb mode with glibc does not boot - qemu-sparc64: ide driver not working, only virtio (but unstable) -- qemu-microblaze: network card emulation fails, little endian works +- qemu-microblaze: ml605 early printk and network card emulation fails, little endian works diff --git a/TODO b/TODO index 0b1d51075..987f9e9a7 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,6 @@ +- ipkg.conf url fixen - hash-style=gnu for non-mips and non-musl +- fix libiberty.a mess - check gold for mozilla compile - check for gcc and SSP again - add daemon() function to functions.sh diff --git a/mk/build.mk b/mk/build.mk index bb2b754aa..ba9c023a9 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -99,7 +99,7 @@ POSTCONFIG= -@\ touch .rebuild.busybox;\ rebuild=1;\ fi; \ - for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_GETTY ADK_RUNTIME_SHELL;do \ + for i in ADK_RUNTIME_PASSWORD ADK_RUNTIME_TMPFS_SIZE ADK_RUNTIME_HOSTNAME ADK_TARGET_ROOTFS ADK_RUNTIME_CONSOLE ADK_RUNTIME_GETTY ADK_RUNTIME_SHELL;do \ if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \ touch .rebuild.base-files;\ rebuild=1;\ diff --git a/mk/image.mk b/mk/image.mk index 8ae7e087e..1e7a802a5 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -157,7 +157,7 @@ ${BUILD_DIR}/root.squashfs: ${TARGET_DIR} -nopad -noappend -root-owned $(MAKE_TRACE) ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR} - ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -X zlib -r ${TARGET_DIR} \ + ${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -X zlib -r ${TARGET_DIR} \ --pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE) createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 73db5e86d..c130523ef 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -1,6 +1,12 @@ config ADK_KERNEL_SPI boolean +config ADK_KERNEL_SPI_MASTER + boolean + +config ADK_KERNEL_SPI_XILINX + boolean + config ADK_KERNEL_SPI_AR71XX select ADK_KERNEL_SPI boolean diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 8d13c5ddd..cb8da0cec 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -22,3 +22,4 @@ CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=1 CONFIG_SERIAL_8250_RUNTIME_UARTS=1 CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_CMDLINE_FORCE=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index fc43ab5f1..3c3546b47 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -19,3 +19,4 @@ CONFIG_NET_VENDOR_XILINX=y CONFIG_XILINX_EMACLITE=y CONFIG_SERIAL_UARTLITE=y CONFIG_SERIAL_UARTLITE_CONSOLE=y +CONFIG_CMDLINE_FORCE=y -- cgit v1.2.3 From 5ca21ed56363329e235bacab4b7b23f063f00a5e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 23 Mar 2014 13:46:32 +0100 Subject: fix ipkg url, to match my server repository --- TODO | 1 - package/base-files/Makefile | 7 ++++++- package/base-files/src/etc/ipkg.conf | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'TODO') diff --git a/TODO b/TODO index 987f9e9a7..a4299ff80 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,3 @@ -- ipkg.conf url fixen - hash-style=gnu for non-mips and non-musl - fix libiberty.a mess - check gold for mozilla compile diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 417c3d09f..ee2630599 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 76 +PKG_RELEASE:= 77 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -30,6 +30,11 @@ endif $(SED) 's,@ARCH@,$(ADK_TARGET_CPU_ARCH),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@SYSTEM@,$(ADK_TARGET_SYSTEM),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@LIBC@,$(ADK_TARGET_LIBC),g' $(IDIR_BASE_FILES)/etc/ipkg.conf +ifneq ($(ADK_TARGET_ABI),) + $(SED) 's,@ABI@,_$(ADK_TARGET_ABI),g' $(IDIR_BASE_FILES)/etc/ipkg.conf +else + $(SED) 's,@ABI@,,g' $(IDIR_BASE_FILES)/etc/ipkg.conf +endif $(SED) 's,@HOST@,$(ADK_HOST),g' $(IDIR_BASE_FILES)/etc/ipkg.conf $(SED) 's,@VENDOR@,$(ADK_VENDOR),g' $(IDIR_BASE_FILES)/etc/ipkg.conf echo /bin/sh >${IDIR_BASE_FILES}/etc/shells diff --git a/package/base-files/src/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf index cef6d2845..9c5ae17d3 100644 --- a/package/base-files/src/etc/ipkg.conf +++ b/package/base-files/src/etc/ipkg.conf @@ -1,3 +1,3 @@ -src @VENDOR@ http://@HOST@/@SYSTEM@_@ARCH@_@LIBC@/packages +src @VENDOR@ http://@HOST@/pkg/@SYSTEM@_@ARCH@_@LIBC@@ABI@/packages dest root / dest ram /tmp -- cgit v1.2.3