summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-23 14:18:57 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-23 14:18:57 +0200
commit37829565dce0182bc0a8f13fd3412a4723f6d73b (patch)
treed29e155cccf685f0c4cbec41125f9eb07ae3a7b7 /package
parent89c97737dfc60a2e934f136c562dab5bb366396b (diff)
revert renaming of /init into /start
- fix foxboard build, tested on classic - remove unsed ibm-x40 target - update all targets to linux-2.6.30.5 - fix native build, use kernel.config.$(CPU_ARCH) as kernel configuration, when /proc/config.gz does not exist on host
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/extra/init (renamed from package/base-files/extra/start)2
-rw-r--r--package/cfgfs/Makefile3
-rw-r--r--package/gcc/Makefile6
-rw-r--r--package/libc/Makefile2
4 files changed, 10 insertions, 3 deletions
diff --git a/package/base-files/extra/start b/package/base-files/extra/init
index 65f33e3d6..4b4e90213 100755
--- a/package/base-files/extra/start
+++ b/package/base-files/extra/init
@@ -1,4 +1,5 @@
#!/bin/sh
+echo "Pre-boot initializing"
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount -nt proc proc /proc
size=$(awk '/MemTotal:/ { if ($2 > 16000) { print 4096 } else { print 2048 }}' /proc/meminfo)
@@ -16,4 +17,5 @@ mount -o remount,rw /
cat /etc/.rnd >/dev/urandom 2>&1
[ -f /etc/fstab ] && mount -a
[ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;}
+echo "Starting system"
exec /sbin/init
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 790f536fc..50d571e90 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -27,5 +27,8 @@ do-install:
${INSTALL_DIR} ${IDIR_CFGFS}/sbin
${INSTALL_BIN} ${WRKBUILD}/fwcf.sh ${IDIR_CFGFS}/sbin/cfgfs
${INSTALL_BIN} ${WRKBUILD}/fwcf.helper.out ${IDIR_CFGFS}/sbin/cfgfs.helper
+ifeq ($(ARCH),cris)
+ ${INSTALL_BIN} ${WRKBUILD}/mtd ${IDIR_CFGFS}/sbin/mtd
+endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 6f36c1a9f..28bea06bf 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -41,10 +41,10 @@ post-install:
${INSTALL_BIN} ${WRKINST}/usr/bin/gcc ${IDIR_GCC}/usr/bin/
${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
-ifeq ($(ADK_TARGET_LIB_GLIBC),y)
- ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
-else
+ifeq ($(ADK_TARGET_LIB_UCLIBC),y)
${CP} ${STAGING_DIR}/lib/crt* ${IDIR_GCC}/usr/lib
+else
+ ${CP} ${STAGING_DIR}/usr/lib/crt* ${IDIR_GCC}/usr/lib
endif
rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/include-fixed
rm -rf ${IDIR_GCC}/usr/lib/gcc/*/*/install-tools
diff --git a/package/libc/Makefile b/package/libc/Makefile
index 786b3f32f..afc9ef32d 100644
--- a/package/libc/Makefile
+++ b/package/libc/Makefile
@@ -6,6 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libc
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
+PKG_SECTION:= base
+PKG_DESCR:= C library
NO_DISTFILES:= 1
include $(TOPDIR)/mk/package.mk