From 37829565dce0182bc0a8f13fd3412a4723f6d73b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 23 Aug 2009 14:18:57 +0200
Subject: 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
---
 package/base-files/extra/init  | 21 +++++++++++++++++++++
 package/base-files/extra/start | 19 -------------------
 package/cfgfs/Makefile         |  3 +++
 package/gcc/Makefile           |  6 +++---
 package/libc/Makefile          |  2 ++
 5 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100755 package/base-files/extra/init
 delete mode 100755 package/base-files/extra/start

(limited to 'package')

diff --git a/package/base-files/extra/init b/package/base-files/extra/init
new file mode 100755
index 000000000..4b4e90213
--- /dev/null
+++ b/package/base-files/extra/init
@@ -0,0 +1,21 @@
+#!/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)
+mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
+mount none /tmp -t tmpfs -o size=${size}k
+mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
+mount -o nosuid,size=64k,mode=0755 -t tmpfs mdev /dev
+mkdir /dev/pts /dev/shm
+mount -o nosuid,noexec -t devpts devpts /dev/pts
+exec 0<>/dev/console >&0 2>&0
+echo >/dev/mdev.seq
+echo "/sbin/mdev" >/proc/sys/kernel/hotplug
+mdev -s
+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/base-files/extra/start b/package/base-files/extra/start
deleted file mode 100755
index 65f33e3d6..000000000
--- a/package/base-files/extra/start
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-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)
-mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
-mount none /tmp -t tmpfs -o size=${size}k
-mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777
-mount -o nosuid,size=64k,mode=0755 -t tmpfs mdev /dev
-mkdir /dev/pts /dev/shm
-mount -o nosuid,noexec -t devpts devpts /dev/pts
-exec 0<>/dev/console >&0 2>&0
-echo >/dev/mdev.seq
-echo "/sbin/mdev" >/proc/sys/kernel/hotplug
-mdev -s
-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 /;}
-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
-- 
cgit v1.2.3