[oe-commits] org.oe.dev merge of '495972572e3314f7dbb0b97d3acfdd0cbebc48eb'

[rwhitby commit]

merge of '495972572e3314f7dbb0b97d3acfdd0cbebc48eb'
     and 'af585eaf4c971b8d572ec4d7df0e1d8812690395'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 0e1ac989492f3e442040490676d2cdb30c4f021e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0e1ac989492f3e442040490676d2cdb30c4f021e
Files:
1
packages/altboot/altboot_1.1.1+wip-SVNR25.bb
packages/altboot/altboot_1.1.1+wip-SVNR28.bb
packages/gpsd/gpsd.inc
Diffs:

#
# mt diff -r495972572e3314f7dbb0b97d3acfdd0cbebc48eb -r0e1ac989492f3e442040490676d2cdb30c4f021e
#
# 
# no changes
# 


#
# mt diff -raf585eaf4c971b8d572ec4d7df0e1d8812690395 -r0e1ac989492f3e442040490676d2cdb30c4f021e
#
# 
# 
# delete "packages/altboot/altboot_1.1.1+wip-SVNR25.bb"
# 
# add_file "packages/altboot/altboot_1.1.1+wip-SVNR28.bb"
#  content [b441ef4b80dc7a864e31ce3005f8edf9734cdba1]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [75bebb2a7e958c987dd4e3cf86a25a82bf7d9642]
#    to [dbbbc4b3a4a1517f0a466e708474500b65473ca5]
# 
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR28.bb	b441ef4b80dc7a864e31ce3005f8edf9734cdba1
+++ packages/altboot/altboot_1.1.1+wip-SVNR28.bb	b441ef4b80dc7a864e31ce3005f8edf9734cdba1
@@ -0,0 +1,123 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: altboot_1.0.5-rc2.bb
+# Date: 21-Feb-06
+
+DESCRIPTION = "The altboot bootmanager"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe at hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+LICENSE = "GPL" 
+
+######################################################################################
+
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_${PN}_append_akita = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
+
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
+
+######################################################################################
+
+SVN_REV = "28"
+PR = "r1"
+
+######################################################################################
+
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = "${MACHINE}"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+
+SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
+
+S = "${WORKDIR}/trunk/"
+
+######################################################################################
+
+FILES_${PN}-conf = "/etc/altboot*cfg"
+
+######################################################################################
+
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
+
+do_install() {
+	install -d ${D}/sbin
+	install -d ${D}/etc/altboot-menu
+	install -d ${D}/etc/altboot-menu/Advanced
+	install -d ${D}/etc/altboot.rc
+	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
+
+	if test -d ${S}/${MACHINE_DIR}
+	then
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
+	else
+		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
+	fi
+
+	install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+	install -m 0644 ${S}/altboot.func ${D}/etc
+	install -m 0644 ${S}/altboot.sbin ${D}/etc
+	install -m 0644 ${S}/altbootctl.conf ${D}/etc
+	install -m 0755 ${S}/init.altboot ${D}/sbin
+	install -m 0755 ${S}/altbootctl ${D}/sbin
+	
+	ln -s /sbin/init.altboot ${D}/sbin/altboot
+
+	if test -d ${S}/${MACHINE_DIR}/altboot-menu
+	then
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
+		
+		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
+		then
+			install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	else
+		install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+		if test -d ${S}/altboot-menu/Advanced
+		then		
+			install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	fi
+	
+	if test -d ${S}/${MACHINE_DIR}/altboot.rc
+	then
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc	
+	else
+		install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+	fi
+}
+
+######################################################################################
+
+do_configure() {
+	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
+	mv ${S}/init.altboot_ ${S}/init.altboot
+}
+
+######################################################################################
+
+pkg_postinst_${PN}() {
+	test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
+	
+	update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+######################################################################################
+
+pkg_postrm_${PN}() {
+	test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
+	
+	update-alternatives --remove init /sbin/init.altboot
+}
+
============================================================
--- packages/gpsd/gpsd.inc	75bebb2a7e958c987dd4e3cf86a25a82bf7d9642
+++ packages/gpsd/gpsd.inc	dbbbc4b3a4a1517f0a466e708474500b65473ca5
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "A TCP/IP Daemon simplifying the communication with GPS devices"
 SECTION = "console/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "dbus-glib ncurses"
+DEPENDS = "dbus-glib ncurses python"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
@@ -19,6 +19,16 @@ export LDFLAGS = "-L${STAGING_LIBDIR} -l
 
 export LDFLAGS = "-L${STAGING_LIBDIR} -lm"
 
+do_compile_prepend() {
+    export BUILD_SYS="${BUILD_SYS}"
+    export HOST_SYS="${HOST_SYS}"
+}
+
+do_install_prepend() {
+    export BUILD_SYS="${BUILD_SYS}"
+    export HOST_SYS="${HOST_SYS}"
+}
+
 do_stage() {
         oe_libinstall -so -C ${S}/.libs libgps ${STAGING_LIBDIR}
         install -m 0655 ${S}/libgps.la ${STAGING_LIBDIR}