[oe-commits] org.oe.dev merge of '0fd461d5e625d032704c778f13e5a3748bae0ae4'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:28:31 UTC 2007
merge of '0fd461d5e625d032704c778f13e5a3748bae0ae4'
and '873714b772263da7a8f353e2f236a7de9f6ac567'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 19862cf656ab4627cf2584d440d224095e65adcd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=19862cf656ab4627cf2584d440d224095e65adcd
Files:
1
packages/bluez/bluez-utils_3.7.bb
conf/distro/angstrom-2007.1.conf
packages/altboot/altboot_0.0.0.bb
packages/altboot/altboot_1.0.5.bb
packages/altboot/altboot_1.0.8.bb
packages/altboot/altboot_wip.bb
packages/altboot/files/altboot-menu/10-noGui
packages/altboot/files/altboot-menu/Advanced/70-install-tgz
packages/altboot/files/init.altboot
packages/bluez/bluez-utils.inc
packages/bluez/bluez-utils_3.9.bb
Diffs:
#
# mt diff -r0fd461d5e625d032704c778f13e5a3748bae0ae4 -r19862cf656ab4627cf2584d440d224095e65adcd
#
#
#
# add_file "packages/bluez/bluez-utils_3.7.bb"
# content [7644ffe67fd0cf94cfed472498a4263e024d4de3]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [994228233caf6444ec1c5c7c87e73a881c2dd863]
# to [ac8173cbc2c8bd6e33051d2174150708b23004cc]
#
# patch "packages/altboot/altboot_0.0.0.bb"
# from [93370aabd5d508d0d8b38eadb4c7745f4290ff29]
# to [62ed5e3bf824642b1b2eb9d82096122d2d7eda0b]
#
# patch "packages/altboot/altboot_1.0.5.bb"
# from [0656d14e89b9287392a8d7c9c4e32c3e882aa93a]
# to [319c577b786a278f821695731ee22a38dd2a6610]
#
# patch "packages/altboot/altboot_1.0.8.bb"
# from [6ed20be054c01a88c7058fc01a7884ebbb675c3c]
# to [3f0ebe44a809f9b86df4fb2d3816a1cb878f418d]
#
# patch "packages/altboot/altboot_wip.bb"
# from [7bb09e09bed02e42bf8d6d47dca9761caba2adfa]
# to [452d25cee961e35c215b7e2ff58d34c48059f680]
#
# patch "packages/altboot/files/altboot-menu/10-noGui"
# from [facdcf7e64ae205a3c7e2b26b4fad036364ccfe0]
# to [7de393d4624218f9a60208b553ee1db288cfca01]
#
# patch "packages/altboot/files/altboot-menu/Advanced/70-install-tgz"
# from [f8320c93b94c9d4a809efbee119bf4c81dd571f0]
# to [8cca225aa80b89a459b40457a1929ff0c30c3099]
#
# patch "packages/altboot/files/init.altboot"
# from [9ee1c02441238acddcc7f2c53990d3ca408fb6f7]
# to [7dee43373cc44563a93d797ef3eabf5cfd99a099]
#
# patch "packages/bluez/bluez-utils.inc"
# from [66a706c3dab2e5328b98afbba43e831eeea1ccd8]
# to [b6f94ad872bf8f1fdc0b84bee413223558ae0c61]
#
# patch "packages/bluez/bluez-utils_3.9.bb"
# from [76237d6bf0ea493d83984610efaade19e986aca9]
# to [16ab945ab8701ac172bb97516712338ec13a8b7e]
#
============================================================
--- packages/bluez/bluez-utils_3.7.bb 7644ffe67fd0cf94cfed472498a4263e024d4de3
+++ packages/bluez/bluez-utils_3.7.bb 7644ffe67fd0cf94cfed472498a4263e024d4de3
@@ -0,0 +1,56 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs-${PV} dbus cups alsa-lib openobex"
+PROVIDES = "bluez-utils-dbus"
+RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
+RREPLACES = "bluez-utils-dbus"
+RCONFLICTS_${PN} = "bluez-utils-nodbus"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+ file://02dtl1_cs.sh \
+ file://hciattach-ti-bts.patch;patch=1"
+
+# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
+# Let's default to that instead of 'any' until further notice...
+SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1"
+
+S = "${WORKDIR}/bluez-utils-${PV}"
+
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-obex --enable-alsa --enable-cups"
+# --enable-obex enable OBEX support
+# --enable-alsa enable ALSA support
+# --enable-cups install CUPS backend support
+# --enable-bccmd install BCCMD interface utility
+# --enable-avctrl install Audio/Video control utility
+# --enable-hid2hci install HID mode switching utility
+# --enable-dfutool install DFU firmware upgrade utility
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+
+do_install_append() {
+ install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
+ mv ${D}${sbindir}/* ${D}${base_sbindir}/
+ mv ${D}${bindir}/* ${D}${base_bindir}/
+ rmdir ${D}${bindir} ${D}${sbindir}
+ chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+ install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
+ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
+ ${sysconfdir}/default/bluetooth"
+
+PACKAGES =+ "${PN}-ciptool bluez-cups-backend"
+FILES_${PN}-ciptool = "/bin/ciptool"
+RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
+RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
============================================================
--- conf/distro/angstrom-2007.1.conf 994228233caf6444ec1c5c7c87e73a881c2dd863
+++ conf/distro/angstrom-2007.1.conf ac8173cbc2c8bd6e33051d2174150708b23004cc
@@ -110,6 +110,7 @@ PREFERRED_PROVIDER_esound ?= "pulseaud
# we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+ ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+"
============================================================
--- packages/altboot/altboot_0.0.0.bb 93370aabd5d508d0d8b38eadb4c7745f4290ff29
+++ packages/altboot/altboot_0.0.0.bb 62ed5e3bf824642b1b2eb9d82096122d2d7eda0b
@@ -8,6 +8,7 @@ LICENSE = "GPL"
DESCRIPTION = "The altboot bootmanager"
HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
LICENSE = "GPL"
+INHIBIT_PACKAGE_STRIP = "1"
######################################################################################
@@ -24,7 +25,7 @@ RDEPENDS_${PN}_fic-gta01 = "${PN}-conf k
######################################################################################
-PR = "r51"
+PR = "r52"
######################################################################################
@@ -68,7 +69,10 @@ do_install() {
install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu
- install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ if test -d ${WORKDIR}/altboot-menu/Advanced
+ then
+ install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+ fi
install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc
============================================================
--- packages/altboot/altboot_1.0.5.bb 0656d14e89b9287392a8d7c9c4e32c3e882aa93a
+++ packages/altboot/altboot_1.0.5.bb 319c577b786a278f821695731ee22a38dd2a6610
@@ -20,7 +20,7 @@ TAG = "${@'v' + bb.data.getVar('PV',d,1)
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=4"
+SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn"
S = "${WORKDIR}/${TAG}/"
============================================================
--- packages/altboot/altboot_1.0.8.bb 6ed20be054c01a88c7058fc01a7884ebbb675c3c
+++ packages/altboot/altboot_1.0.8.bb 3f0ebe44a809f9b86df4fb2d3816a1cb878f418d
@@ -34,7 +34,7 @@ TAG = "${@'v' + bb.data.getVar('PV',d,1)
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=2"
+SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn"
S = "${WORKDIR}/${TAG}/"
============================================================
--- packages/altboot/altboot_wip.bb 7bb09e09bed02e42bf8d6d47dca9761caba2adfa
+++ packages/altboot/altboot_wip.bb 452d25cee961e35c215b7e2ff58d34c48059f680
@@ -38,7 +38,7 @@ TAG = "${@'v' + bb.data.getVar('PV',d,1)
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-').replace('+', '-')}"
-SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};rev=6"
+SRC_URI = "svn://hentges.net/altboot/tags/;module=${TAG};proto=svn"
S = "${WORKDIR}/${TAG}/"
============================================================
--- packages/altboot/files/altboot-menu/10-noGui facdcf7e64ae205a3c7e2b26b4fad036364ccfe0
+++ packages/altboot/files/altboot-menu/10-noGui 7de393d4624218f9a60208b553ee1db288cfca01
@@ -1,7 +1,9 @@ M_TITLE="Don't launch GUI"
# !/bin/sh
M_TITLE="Don't launch GUI"
+test "$DISABLE_NOGUI_BOOT" = yes && exit 0
+
run_module() {
clear ; exec $REAL_INIT "$NO_GUI_RL"
exit 0
============================================================
--- packages/altboot/files/altboot-menu/Advanced/70-install-tgz f8320c93b94c9d4a809efbee119bf4c81dd571f0
+++ packages/altboot/files/altboot-menu/Advanced/70-install-tgz 8cca225aa80b89a459b40457a1929ff0c30c3099
@@ -1,7 +1,9 @@ M_FLAGS="noRemember"
#!/bin/sh
M_TITLE="Install RootFS from tar.gz"
M_FLAGS="noRemember"
+test "$DISABLE_INSTTGZ_BOOT" = yes && exit 0
+
run_module(){
test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
============================================================
--- packages/altboot/files/init.altboot 9ee1c02441238acddcc7f2c53990d3ca408fb6f7
+++ packages/altboot/files/init.altboot 7dee43373cc44563a93d797ef3eabf5cfd99a099
@@ -20,12 +20,6 @@ OUT_TTY="`tty`" ; test -z "$OUT_TTY" &&
# If this step fails the results are fatal. Seen on Collie / kernel 2.4 (where else...)
OUT_TTY="`tty`" ; test -z "$OUT_TTY" && OUT_TTY="/dev/tty1"
-if test -z "$OUT_TTY"
-then
- OUT_TTY="/dev/tty1"
- echo "WARNING: Assgnment of OUT_TTY failed!" > "$OUT_TTY"
-fi
-
if ( echo "$OUT_TTY" | grep -q "not" )
then
OUT_TTY="/dev/tty1"
@@ -47,7 +41,7 @@ fi
rm "${ALTBOOT_CFG_FILE}.next-reboot"
fi
-test "$ENABLE_DEBUGGING" = "yes" && ENABLE_DEBUG="yes"
+ENABLE_DEBUG="$ENABLE_DEBUGGING"
C_RED="\033[31m"
C_YELLOW="\033[33m"
@@ -81,10 +75,9 @@ show_menu() {
show_menu() {
test -z "$1" && die "DEBUG: Parameter 1 is empty in show_menu"
! test -d "$1" && die "show_menu: [$1] not found or no directory."
-
+
echo ""
- echo -e "altboot v$VERSION\n"
-
+ echo -e "altboot v$VERSION\n"
m_entry=""
@@ -93,6 +86,7 @@ show_menu() {
cnt=0 ; reset_pref "menu_filelist"
for file in `ls -1`
do
+# debug_echo "show_menu(): file = [$file]"
if ! test -d "$1/$file"
then
# NOTE: It is important to use "." here so that the script inherits
@@ -165,11 +159,7 @@ show_menu() {
fi
done
- echo ""
-
-# export_pref "$menu_filelist" /tmp/menu_filelist.cache
-# export_pref "$menu_fileflags" /tmp/menu_fileflags.cache
-
+ echo ""
}
# This function is used to display the content of directories below
@@ -178,11 +168,7 @@ show_sub_menu() {
dirname="`basename "$1"`"
d_entries="`dump_pref "menu_filelist" | grep "$dirname/"`"
-
- #dump_pref "menu_filelist"
- #dump_pref "menu_fileflags"
- #echo "[$d_entries]"
-
+
echo -e "\naltboot v$VERSION: $dirname menu\n"
for d_entry in $d_entries
@@ -190,11 +176,7 @@ show_sub_menu() {
d_entry_number="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\1/p"`"
d_entry_file="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\2/p"`"
d_entry_title="`$d_entry_file title`"
-
-# echo "number: [$d_entry_number]"
-# echo "file: [$d_entry_file]"
-# echo "title: [$d_entry_title]"
-
+
echo -e "\t\t[$d_entry_number] $d_entry_title"
done
@@ -231,7 +213,7 @@ run_timer() {
# Shows the timer and sets $launch_altboot to yes if a keypress was detected
run_timer() {
- if test "$TIMEOUT" != 0
+ if test "$TIMEOUT" != 0 -a "$TIMEOUT" != "[none]"
then
mount -t proc proc /proc >/dev/null 2>&1
@@ -278,6 +260,17 @@ run_timer() {
else
launch_altboot=yes
fi
+
+ if test "$TIMEOUT" = "[none]"
+ then
+ echo ""
+ echo -e "altboot v$VERSION ($MACHINE)\n"
+
+ echo "NOTE: The menu is not available on this device"
+ echo "Use \"set-bootdev\" to change the boot device"
+
+ launch_altboot=no
+ fi
}
# $1 = ID
@@ -313,7 +306,7 @@ launch_selection() {
file="`echo "$file_" | sed -n "s/\(.*\)\:\(.*\)/\1/p"`"
test -z "$file" && file="$file_"
- #echo "[$file_]: [$type] : [$flags] / [$file] ($junk)"
+# debug_echo "[$file_]: [$type] : [$flags] / [$file] ($junk)"
# The selected menu-item points to a directory
if test "$type" = DIR
@@ -494,10 +487,29 @@ fi
# Note: this is positively ugly. If someone knows a better way to detect whether
# we are already booted into a runlevel _without_ reading /var and / or using `runlevel`
# PLEASE let me know.
+#
+# The NSLU2 is an exception as it uses the way-ugly busybox "ps"
+#
-if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1" != "+force"
+MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`"
+
+case "$MACHINE" in
+ *NSLU2) if test -f /proc/cmdline -a "`ps |wc -l|tr -d " "`" -gt 25 -a "$1" != "-force" -a "$1" != "+force"
+ then
+ user_called=1
+ fi
+ ;;
+
+ *) if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" -a "$1"!= "+force" >/dev/null 2>&1
+ then
+ user_called=1
+ fi
+ ;;
+esac
+
+if test "$user_called" = "1"
then
- echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >"$OUT_TTY"
+ echo "altboot: Using real init [$REAL_INIT] [$*] [`ps |wc -l|tr -d " "`] *" >"$OUT_TTY"
exec $REAL_INIT $*
# exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
exit 0
@@ -543,7 +555,8 @@ else
echo "Booting last selection: [$last_selection]" >"$OUT_TTY"
# Set up the wanna-be array of available menu entries and their numbers
- show_menu /etc/altboot-menu >/dev/null
+ show_menu /etc/altboot-menu >/dev/null 2>&1
+
junk="$last_selection"
launch_selection /etc/altboot-menu >"$OUT_TTY"
fi
============================================================
--- packages/bluez/bluez-utils.inc 66a706c3dab2e5328b98afbba43e831eeea1ccd8
+++ packages/bluez/bluez-utils.inc b6f94ad872bf8f1fdc0b84bee413223558ae0c61
@@ -1,7 +1,7 @@ PRIORITY = "optional"
DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
SECTION = "console"
PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} dbus"
+DEPENDS = "bluez-libs-${PV} dbus cups"
PROVIDES = "bluez-utils-dbus"
RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
RREPLACES = "bluez-utils-dbus"
@@ -20,7 +20,7 @@ S = "${WORKDIR}/bluez-utils-${PV}"
S = "${WORKDIR}/bluez-utils-${PV}"
-EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci"
+EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-cups"
# --enable-obex enable OBEX support
# --enable-alsa enable ALSA support
# --enable-cups install CUPS backend support
@@ -48,7 +48,10 @@ CONFFILES_${PN} = "${sysconfdir}/bluetoo
CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
${sysconfdir}/default/bluetooth"
-PACKAGES =+ "${PN}-ciptool"
+PACKAGES =+ "${PN}-ciptool bluez-cups-backend"
FILES_${PN}-ciptool = "/bin/ciptool"
RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool"
RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus"
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
============================================================
--- packages/bluez/bluez-utils_3.9.bb 76237d6bf0ea493d83984610efaade19e986aca9
+++ packages/bluez/bluez-utils_3.9.bb 16ab945ab8701ac172bb97516712338ec13a8b7e
@@ -1,3 +1,3 @@ require bluez-utils.inc
require bluez-utils.inc
+PR = "r3"
-PR = "r2"
#
# mt diff -r873714b772263da7a8f353e2f236a7de9f6ac567 -r19862cf656ab4627cf2584d440d224095e65adcd
#
#
# no changes
#
More information about the Openembedded-commits
mailing list