diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-28 10:14:40 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-28 10:25:06 +0200 |
| commit | c43854da4d87c25f54cce20ad188a6877dc15f71 (patch) | |
| tree | 2fce408ef916b6c205e3f74a5ce2c1b0fc969beb /package | |
| parent | 86e450dac4a6d50ebda79f80081525462d1bb68b (diff) | |
add some basic infrastructure for qemu-system-m68k
Qemu emulates a Coldfire Evaluation board without MMU.
As that is the first non-MMU platform in OpenADK I added
ADK_TARGET_UCLINUX. Mksh can not be used for non-MMU, because
it requires fork() for job control and other things.
We use hush here. non-MMU support in uClibc does not have
shared library support.
Kernel does not start yet. So no runtime testing, but at least
coldfire toolchain can be tested with uClibc-ng.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 5 | ||||
| -rw-r--r-- | package/busybox/Makefile | 5 | ||||
| -rw-r--r-- | package/libgcc/Makefile | 2 | ||||
| -rw-r--r-- | package/mksh/Makefile | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 54f100b0d..277b3f59d 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_SECTION:= base/apps PKG_DESCR:= basic files and scripts @@ -40,6 +40,9 @@ endif ifneq (${ADK_PACKAGE_ASH},) echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells endif +ifneq (${ADK_PACKAGE_HUSH},) + echo /bin/hush >>${IDIR_BASE_FILES}/etc/shells +endif ifneq (${ADK_PACKAGE_BASH},) echo /bin/bash >>${IDIR_BASE_FILES}/etc/shells endif diff --git a/package/busybox/Makefile b/package/busybox/Makefile index eabed3ef3..e31de2c4b 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.22.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 337d1a15ab1cb1d4ed423168b1eb7d7e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base/apps @@ -41,6 +41,9 @@ do-configure: ${WRKBUILD}/.config.tmp; \ cp ${WRKBUILD}/.config.tmp ${WRKBUILD}/.config; \ done +ifeq ($(ADK_TARGET_UCLINUX),y) + echo 'BUSYBOX_NOMMU=y' >> ${WRKBUILD}/.config +endif $(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config yes '' | PATH='$(HOST_PATH)' $(MAKE) ${BB_MAKE_FLAGS} -C ${WRKBUILD} oldconfig $(MAKE_TRACE) diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 56fff366a..91a5b18c1 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -34,6 +34,7 @@ INSTALL_STYLE:= manual libgcc-install: $(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_TARGET_UCLINUX),) ifeq ($(ADK_LINUX_SH),y) ifeq ($(ADK_TARGET_LIB_GLIBC),) ${CP} ${STAGING_TARGET_DIR}/lib/m4-nofpu/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) @@ -41,5 +42,6 @@ endif else ${CP} ${STAGING_TARGET_DIR}/lib/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif +endif include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 1e2ddb8b1..29f03beca 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -12,7 +12,7 @@ PKG_SECTION:= base/shells PKG_URL:= http://www.mirbsd.org/ PKG_SITES:= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} -PKG_DFLT_MKSH:= y if !ADK_TOOLCHAIN_ONLY +PKG_DFLT_MKSH:= y if !ADK_TOOLCHAIN_ONLY && !ADK_TARGET_UCLINUX DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/${PKG_NAME} |