Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/25 23:33:20+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/02/25 23:32:55+01:00 dyndns.org!reenoo
libffi: fix a few hardcoded paths.

2005/02/25 16:28:33-06:00 ti.com!kergoth
Fix sysvinit to obey the base_* target path variables, and kill the old sysvinit 2.85.

2005/02/25 16:26:09-06:00 ti.com!kergoth
linux-input shouldnt be inheriting module-base.  There's no need for it, and it was breaking the build.

BKrev: 421fa949UlQ--1-ws2Usilb2uD16vQ

4 files changed, 10 insertions, 105 deletions

diff --git a/packages/libffi/libffi_2.0+gcc3.4.1.bb b/packages/libffi/libffi_2.0+gcc3.4.1.bb
index 90886f1cd8..7ec822c52c 100644
--- a/packages/libffi/libffi_2.0+gcc3.4.1.bb
+++ b/packages/libffi/libffi_2.0+gcc3.4.1.bb
@@ -50,7 +50,7 @@ do_configure () {
 
 do_install_append() {
 	# follow debian and move this to $includedir
-	mv ${D}${libdir}/gcc/arm-linux/3.4.1/include/libffi/ffitarget.h ${D}${includedir}/
+	mv ${D}${libdir}/gcc/${TARGET_SYS}/${GCC_VER}/include/libffi/ffitarget.h ${D}${includedir}/
 }
 
 ffi_include = "ffi.h ffitarget.h"
diff --git a/packages/linux-input/linux-input_cvs.bb b/packages/linux-input/linux-input_cvs.bb
index f47289f775..c377a0a397 100644
--- a/packages/linux-input/linux-input_cvs.bb
+++ b/packages/linux-input/linux-input_cvs.bb
@@ -1,5 +1,5 @@
 SECTION = "unknown"
-PR = "r1"
+PR = "r2"
 PV = "0.0cvs${CVSDATE}"
 
 SRC_URI = "cvs://anonymous@cvs1.sourceforge.net/cvsroot/linuxconsole;module=ruby \
@@ -7,7 +7,6 @@ SRC_URI = "cvs://anonymous@cvs1.sourceforge.net/cvsroot/linuxconsole;module=ruby
 	file://makefile.patch;patch=1;pnum=0 \
 	file://snes232.patch;patch=1;pnum=0"
 LICENSE = "GPL"
-inherit module-base
 
 S = "${WORKDIR}/ruby/utils"
 
diff --git a/packages/sysvinit/sysvinit_2.85.bb b/packages/sysvinit/sysvinit_2.85.bb
deleted file mode 100644
index a64f0d2f11..0000000000
--- a/packages/sysvinit/sysvinit_2.85.bb
+++ /dev/null
@@ -1,94 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "System-V like init.\
- Init is the first program to run after your system is booted, and\
- continues to run as process number 1 until your system halts. Inits\
- job is to start other programs that are essential to the operation of\
- your system. All processes are descended from init. For more information,\
- see the manual page init(8)."
-PACKAGES = "sysvinit"
-FILES_${PN} = "${base_sbindir} ${bindir} ${sysconfdir}"
-FILES_sysv-rc = "${sbindir}"
-PR = "r1"
-LICENSE = "GPL"
-# USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
-# Set PACKAGE_ARCH appropriately.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-USE_VT ?= "1"
-
-SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-${PV}.tar.gz \
-           file://need \
-           file://provide \
-           file://inittab \
-           file://rcS-default \
-           file://rc \
-           file://rcS"
-S = "${WORKDIR}/sysvinit-${PV}/src"
-
-CFLAGS_prepend = "-D_GNU_SOURCE "
-export LCRYPT = "-lcrypt"
-
-
-do_install () {
-	install -d ${D}${bindir} ${D}${sbindir} \
-		   ${D}${base_sbindir} ${D}${sysconfdir}/default \
-		   ${D}${sysconfdir}/init.d
-	install -m 755 halt killall5 \
-		runlevel shutdown ${D}${base_sbindir}/
-	install -m 755 init ${D}${base_sbindir}/sysvinit
-	install -m 755 mesg last ${D}${bindir}
-	install -m 0755 ${WORKDIR}/need		${D}${base_sbindir}/need.sysvinit
-	install -m 0755 ${WORKDIR}/provide		${D}${base_sbindir}/provide.sysvinit
-	ln -sf halt ${D}${base_sbindir}/reboot
-	ln -sf halt ${D}${base_sbindir}/poweroff
-	ln -sf init ${D}${base_sbindir}/telinit
-	ln -sf killall5 ${D}${base_sbindir}/pidof
-	ln -sf last ${D}${bindir}/lastb
-	install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
-	if [ ! -z "${SERIAL_CONSOLE}" ]; then
-		echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
-	fi
-	if [ "${USE_VT}" == "1" ]; then
-		cat <<EOF >>${D}${sysconfdir}/inittab
-# ${base_sbindir}/getty invocations for the runlevels.
-#
-# The "id" field MUST be the same as the last
-# characters of the device (after "tty").
-#
-# Format:
-#  <id>:<runlevels>:<action>:<process>
-#
-1:2345:respawn:${base_sbindir}/getty 38400 tty1
-# 2:23:respawn:${base_sbindir}/getty 38400 tty2
-# 3:23:respawn:${base_sbindir}/getty 38400 tty3
-# 4:23:respawn:${base_sbindir}/getty 38400 tty4
-EOF
-	fi
-	install -m 0644    ${WORKDIR}/rcS-default	${D}${sysconfdir}/default/rcS
-	install -m 0755    ${WORKDIR}/rc		${D}${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/rcS		${D}${sysconfdir}/init.d
-}
-
-
-do_install_append_ramses () {
-	cat <<EOF >>${D}${sysconfdir}/inittab
-# Bluetooth
-#1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1
-# External serial port
-4:2345:respawn:${base_sbindir}/getty -L 115200 tts/4
-# Framebuffer
-v1:2345:respawn:${base_sbindir}/getty -L 115200 vc/1
-EOF
-}
-
-
-pkg_postinst () {
-set -e
-# FIXME: use update-alternatives.. but what if the user doesnt have it?
-#if [ -n "`which update-alternatives 2>/dev/null`" ]; then
-#	update-alternatives blah
-#else
-	ln -sf sysvinit $D/sbin/init
-#fi
-exit 0
-}
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index e55b3fa0f4..96b6c1a68f 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r11"
+PR = "r12"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
@@ -33,20 +33,20 @@ B = "${S}/src"
 inherit update-alternatives
 
 ALTERNATIVE_NAME = "init"
-ALTERNATIVE_LINK = "/sbin/init"
-ALTERNATIVE_PATH = "/sbin/init.sysvinit"
+ALTERNATIVE_LINK = "${base_sbindir}/init"
+ALTERNATIVE_PATH = "${base_sbindir}/init.sysvinit"
 ALTERNATIVE_PRIORITY = "50"
 
 PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
-FILES_${PN} += "${base_sbindir} /bin"
-FILES_sysvinit-pidof = "/bin/pidof"
-FILES_sysvinit-sulogin = "/sbin/sulogin"
+FILES_${PN} += "${base_sbindir} ${base_bindir}"
+FILES_sysvinit-pidof = "${base_bindir}/pidof"
+FILES_sysvinit-sulogin = "${base_sbindir}/sulogin"
 
 CFLAGS_prepend = "-D_GNU_SOURCE "
 export LCRYPT = "-lcrypt"
 EXTRA_OEMAKE += "'INSTALL=install' \
-		 'bindir=/bin' \
-		 'sbindir=/sbin' \
+		 'bindir=${base_bindir}' \
+		 'sbindir=${base_sbindir}' \
 		 'usrbindir=${bindir}' \
 		 'usrsbindir=${sbindir}' \
 		 'includedir=${includedir}' \