From 683b7ec9393f21e2d9ef3c846a3fbf24178423ef Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Mar 2014 14:53:48 +0100 Subject: make a fix for microblaze --- package/strace/patches/patch-process_c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'package') diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c index a3d71bc9e..1c9ba10e9 100644 --- a/package/strace/patches/patch-process_c +++ b/package/strace/patches/patch-process_c @@ -1,5 +1,5 @@ --- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200 -+++ strace-4.8/process.c 2014-02-25 20:02:55.000000000 +0100 ++++ strace-4.8/process.c 2014-03-07 11:15:51.318966166 +0100 @@ -55,7 +55,7 @@ # endif #endif @@ -9,18 +9,31 @@ # undef PTRACE_SYSCALL # ifdef HAVE_STRUCT_IA64_FPREG # define ia64_fpreg XXX_ia64_fpreg -@@ -104,6 +104,10 @@ +@@ -104,6 +104,14 @@ # include #endif +#ifdef __arm__ +#include +#endif ++ ++#ifdef __microblaze__ ++#include ++#endif + #ifdef HAVE_PRCTL # include -@@ -2857,7 +2861,7 @@ sys_sched_setscheduler(struct tcb *tcp) +@@ -2472,7 +2480,7 @@ const struct xlat struct_user_offsets[] + #elif defined(TILE) + /* nothing */ + #elif defined(MICROBLAZE) +- { sizeof(struct user), "sizeof(struct user)" }, ++ /* nothing */ + #elif defined(AVR32) + { uoff(u_tsize), "offsetof(struct user, u_tsize)" }, + { uoff(u_dsize), "offsetof(struct user, u_dsize)" }, +@@ -2857,7 +2865,7 @@ sys_sched_setscheduler(struct tcb *tcp) if (umove(tcp, tcp->u_arg[2], &p) < 0) tprintf(", %#lx", tcp->u_arg[2]); else @@ -29,7 +42,7 @@ } return 0; } -@@ -2872,7 +2876,7 @@ sys_sched_getparam(struct tcb *tcp) +@@ -2872,7 +2880,7 @@ sys_sched_getparam(struct tcb *tcp) if (umove(tcp, tcp->u_arg[1], &p) < 0) tprintf("%#lx", tcp->u_arg[1]); else @@ -38,7 +51,7 @@ } return 0; } -@@ -2885,7 +2889,7 @@ sys_sched_setparam(struct tcb *tcp) +@@ -2885,7 +2893,7 @@ sys_sched_setparam(struct tcb *tcp) if (umove(tcp, tcp->u_arg[1], &p) < 0) tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]); else -- cgit v1.2.3 From 3ae829cba98c71a4b4143f443ea65fcf370006e4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 10 Mar 2014 17:26:29 +0100 Subject: add fs startup script for net mounts and data mount points --- package/base-files/Makefile | 2 +- package/base-files/src/etc/fstab | 1 - package/base-files/src/etc/group | 9 +++-- package/base-files/src/etc/init.d/fs | 69 ++++++++++++++++++++++++++++++++++++ package/base-files/src/etc/inittab | 4 ++- 5 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 package/base-files/src/etc/init.d/fs (limited to 'package') diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a298d108b..f320d6b82 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:= 67 +PKG_RELEASE:= 68 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/fstab b/package/base-files/src/etc/fstab index fafa1d56e..5c09c2510 100644 --- a/package/base-files/src/etc/fstab +++ b/package/base-files/src/etc/fstab @@ -1,7 +1,6 @@ # /etc/fstab: static file system information. # # -#/dev/root / ext2 rw,noauto 0 1 proc /proc proc defaults 0 0 devpts /dev/pts devpts defaults,gid=5,mode=620 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 diff --git a/package/base-files/src/etc/group b/package/base-files/src/etc/group index bbf6c0603..51d78238c 100644 --- a/package/base-files/src/etc/group +++ b/package/base-files/src/etc/group @@ -1,4 +1,9 @@ root:x:0: -video:x:1: -audio:x:2: +daemon:x:1: +bin:x:2: +sys:x:3: +adm:x:4: +tty:x:5: +video:x:6: +audio:x:7: nogroup:x:65534: diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs new file mode 100644 index 000000000..f79d9348d --- /dev/null +++ b/package/base-files/src/etc/init.d/fs @@ -0,0 +1,69 @@ +#!/bin/sh +#INIT 60 +[[ $1 = autostart ]] || exit 0 + +# activate swap +[ -x /sbin/swapon ] && { swapon -a; } + +# activate any logical volumes +[ -x /usr/sbin/lvm ] && { lvm vgscan; lvm vgchange -ay; } + +# filesystem checks +[ -x /sbin/fsck.ext2 ] && { + for i in $(grep ext2 /etc/fstab|awk '{ print $1}');do fsck.ext2 $i;done; +} +[ -x /sbin/fsck.ext3 ] && { + for i in $(grep ext3 /etc/fstab|awk '{ print $1}');do fsck.ext3 $i;done; +} +[ -x /sbin/fsck.ext4 ] && { + for i in $(grep ext4 /etc/fstab|awk '{ print $1}');do fsck.ext4 $i;done; +} +[ -x /sbin/fsck.xfs ] && { + for i in $(grep xfs /etc/fstab|awk '{ print $1}');do xfs_repair $i;done; +} +# local filesystems +grep ext2 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep ext2 /etc/fstab >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext2 + fi +fi +grep ext3 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep ext3 /etc/fstab >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext3 + fi +fi +grep ext4 /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep ext4 /etc/fstab >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t ext4 + fi +fi +grep xfs /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep xfs /etc/fstab >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t xfs + fi +fi + +# mount net filesystems (nfs/cifs) +grep nfs /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep nfs /etc/fstab >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t nfs + fi +fi +grep cifs /proc/filesystems >/dev/null 2>&1 +if [ $? -eq 0 ];then + grep cifs /etc/fstab >/dev/null 2>&1 + if [ $? -eq 0 ];then + mount -a -t cifs + fi +fi +exit 0 diff --git a/package/base-files/src/etc/inittab b/package/base-files/src/etc/inittab index eb00b00ef..f6183798e 100644 --- a/package/base-files/src/etc/inittab +++ b/package/base-files/src/etc/inittab @@ -1,7 +1,9 @@ null::sysinit:/bin/mount -t proc proc /proc +null::sysinit:/bin/mount -t sysfs sys /sys null::sysinit:/bin/mkdir -p /dev/pts null::sysinit:/bin/mkdir -p /dev/shm -null::sysinit:/bin/mount -a +null::sysinit:/bin/mount -a -t devpts +null::sysinit:/bin/mount -a -t tmpfs ::sysinit:/etc/init.d/rcS ::shutdown:/etc/init.d/rcK null::shutdown:/bin/umount -a -r -- cgit v1.2.3 From 8f148a08f29ccb6c21f108549e20aa8e0bb04b79 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Mar 2014 10:55:56 +0100 Subject: finetune rebuild stuff need to rebuild kmod-packages, when removed. f.e. by hudson. fix kmod-soft-watchdog while there. Use bin directory for ldd to avoid a cpio failure. --- package/musl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/musl/Makefile b/package/musl/Makefile index 3341c83a8..efb5404cb 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -55,13 +55,13 @@ endif # do nothing, musl is already build in toolchain directory do-install: - ${INSTALL_DIR} $(IDIR_MUSL)/usr/bin + ${INSTALL_DIR} $(IDIR_MUSL)/bin ${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) $(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) (cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \ ln -sf libc.so ld-musl-$(MARCH).so.1) - (cd $(IDIR_MUSL)/usr/bin && \ - ln -sf ../../lib/ld-musl-$(MARCH).so.1 ldd) + (cd $(IDIR_MUSL)/bin && \ + ln -sf ../lib/ld-musl-$(MARCH).so.1 ldd) musl-dev-install: -- cgit v1.2.3 From b782769986db676b49d10b22e20f2b8184448fc0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 11 Mar 2014 13:56:39 +0100 Subject: add adk-test-tools package - scripts to shutdown qemu from linux - only start klogd when printk is available --- package/adk-test-tools/Makefile | 28 ++++++++++++++++++++++++++++ package/adk-test-tools/files/test.init | 11 +++++++++++ package/adk-test-tools/src/qmp | 4 ++++ package/adk-test-tools/src/quit | 2 ++ package/base-files/Makefile | 2 +- package/base-files/src/etc/init.d/boot | 5 ----- package/base-files/src/etc/init.d/rcS | 4 ++++ package/busybox/Makefile | 2 +- package/busybox/files/syslog.init | 8 ++++++-- package/dropbear/Makefile | 2 +- package/strace/patches/patch-util_c | 12 ++++++++++++ 11 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 package/adk-test-tools/Makefile create mode 100755 package/adk-test-tools/files/test.init create mode 100755 package/adk-test-tools/src/qmp create mode 100755 package/adk-test-tools/src/quit create mode 100644 package/strace/patches/patch-util_c (limited to 'package') diff --git a/package/adk-test-tools/Makefile b/package/adk-test-tools/Makefile new file mode 100644 index 000000000..bc2624fe9 --- /dev/null +++ b/package/adk-test-tools/Makefile @@ -0,0 +1,28 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= adk-test-tools +PKG_VERSION:= 0.1 +PKG_RELEASE:= 1 +PKG_DESCR:= helper tools and scripts for adk-test-framework +PKG_SECTION:= misc +PKG_URL:= http://openadk.org/ + +NO_DISTFILES:= 1 + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,ADK_TEST_TOOLS,adk-test-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +adk-test-tools-install: + $(INSTALL_DIR) $(IDIR_ADK_TEST_TOOLS)/usr/bin + $(INSTALL_BIN) $(WRKBUILD)/{qmp,quit} \ + $(IDIR_ADK_TEST_TOOLS)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/adk-test-tools/files/test.init b/package/adk-test-tools/files/test.init new file mode 100755 index 000000000..81095fa39 --- /dev/null +++ b/package/adk-test-tools/files/test.init @@ -0,0 +1,11 @@ +#!/bin/sh +#PKG adk-test-tools +#INIT 90 +[[ $1 = autostart ]] || exit 0 +echo "Starting test script ..." +if [ -x /run.sh ];then + exec /run.sh +else + echo "no run.sh found" +fi +quit diff --git a/package/adk-test-tools/src/qmp b/package/adk-test-tools/src/qmp new file mode 100755 index 000000000..8f9912222 --- /dev/null +++ b/package/adk-test-tools/src/qmp @@ -0,0 +1,4 @@ +#!/bin/sh +echo '{ "execute": "qmp_capabilities" }' +sleep 1 +echo '{ "execute": "quit" }' diff --git a/package/adk-test-tools/src/quit b/package/adk-test-tools/src/quit new file mode 100755 index 000000000..a625553e2 --- /dev/null +++ b/package/adk-test-tools/src/quit @@ -0,0 +1,2 @@ +#!/bin/sh +socat exec:/usr/bin/qmp tcp:10.0.2.2:4444 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f320d6b82..f325d2210 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:= 68 +PKG_RELEASE:= 69 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host diff --git a/package/base-files/src/etc/init.d/boot b/package/base-files/src/etc/init.d/boot index 8daf52b89..fc2f79ac2 100644 --- a/package/base-files/src/etc/init.d/boot +++ b/package/base-files/src/etc/init.d/boot @@ -4,11 +4,6 @@ . /etc/functions.sh -# disable kernel messages -if [ -f /proc/sys/kernel/printk ];then - echo 0 > /proc/sys/kernel/printk -fi - # remount /dev with smaller size mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev diff --git a/package/base-files/src/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS index d34cce6e9..9daa8f5cd 100755 --- a/package/base-files/src/etc/init.d/rcS +++ b/package/base-files/src/etc/init.d/rcS @@ -1,4 +1,8 @@ #!/bin/sh +# disable kernel messages +if [ -f /proc/sys/kernel/printk ];then + echo 0 > /proc/sys/kernel/printk +fi echo "System initialization ..." export PATH=/bin:/sbin:/usr/bin:/usr/sbin ln -s /proc/self/fd/2 /dev/stderr diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 1fe63ff0a..c1923708e 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.21.1 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslog.init index 7a84815a6..7a85430ca 100644 --- a/package/busybox/files/syslog.init +++ b/package/busybox/files/syslog.init @@ -11,10 +11,14 @@ autostart) ;; start) /sbin/syslogd $syslogd_flags - /sbin/klogd + if [ -f /proc/sys/kernel/printk ];then + /sbin/klogd + fi ;; stop) - kill $(pgrep -f /sbin/klogd) + if [ -f /proc/sys/kernel/printk ];then + kill $(pgrep -f /sbin/klogd) + fi kill $(pgrep -f /sbin/syslogd) ;; restart) diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 0e497279f..319c7522f 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -14,7 +14,7 @@ PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY +PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY && !ADK_PKG_TEST PKG_SUBPKGS:= DROPBEAR DBCONVERT PKGSD_DBCONVERT:= Utility for converting SSH private keys diff --git a/package/strace/patches/patch-util_c b/package/strace/patches/patch-util_c new file mode 100644 index 000000000..34181a22f --- /dev/null +++ b/package/strace/patches/patch-util_c @@ -0,0 +1,12 @@ +--- strace-4.8.orig/util.c 2013-05-06 20:23:01.000000000 +0200 ++++ strace-4.8/util.c 2014-03-07 15:34:01.074036954 +0100 +@@ -55,7 +55,9 @@ + # ifdef HAVE_STRUCT_PT_ALL_USER_REGS + # define pt_all_user_regs XXX_pt_all_user_regs + # endif ++#if !defined(SH) + # include ++#endif + # undef ia64_fpreg + # undef pt_all_user_regs + #endif -- cgit v1.2.3