[oe-commits] org.oe.dev merge of '12e21bd2f481aca9252bc00eb529548b1b0187fd'
oe commit
openembedded-commits at lists.openembedded.org
Sun Oct 7 04:34:10 UTC 2007
merge of '12e21bd2f481aca9252bc00eb529548b1b0187fd'
and '5057b0d0a8cd261e84871fecfebfa818b91794ae'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a5ac78228f6cc50bf85d721b527221474212e68d
ViewMTN: http://monotone.openembedded.org/revision/info/a5ac78228f6cc50bf85d721b527221474212e68d
Files:
1
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
packages/tasks/task-slugos.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
packages/musicpd/mpd-alsa_svn.bb
conf/distro/angstrom-2007.1.conf
conf/machine/h1910.conf
packages/gpsd/files/gpsd
packages/gpsd/gpsd_2.28.bb
packages/gpsd/gpsd_2.34.bb
Diffs:
#
# mt diff -r12e21bd2f481aca9252bc00eb529548b1b0187fd -ra5ac78228f6cc50bf85d721b527221474212e68d
#
#
#
# patch "packages/slugos-init/files/modulefunctions"
# from [2fa625b35ea31712fde433431b13ec9b7c79d43b]
# to [4b87b10cbcadb95da00017ee6f9d7f80b767719b]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [b86dcf4eeaea00eac2b46b43ce047bfcb81bec2e]
# to [35c419193e544a8d85ce740472291aa93c87fd37]
#
# patch "packages/tasks/task-slugos.bb"
# from [886169eff4c43655de9f427988ddbe1c01deab8f]
# to [6828037c6d95ea3758b661c5277817df96d75b69]
#
============================================================
--- packages/slugos-init/files/modulefunctions 2fa625b35ea31712fde433431b13ec9b7c79d43b
+++ packages/slugos-init/files/modulefunctions 4b87b10cbcadb95da00017ee6f9d7f80b767719b
@@ -6,15 +6,18 @@ loaddiskmods(){
loaddiskmods(){
case "$(machine)" in
nslu2)
+ modprobe ehci-hcd
modprobe ohci-hcd
;;
nas100d)
+ modprobe ehci-hcd
+ modprobe uhci-hcd
modprobe pata-artop
- modprobe uhci-hcd
;;
dsmg600)
- modprobe pata-artop
+ modprobe ehci-hcd
modprobe uhci-hcd
+ modprobe pata-artop
;;
esac
============================================================
--- packages/slugos-init/slugos-init_0.10.bb b86dcf4eeaea00eac2b46b43ce047bfcb81bec2e
+++ packages/slugos-init/slugos-init_0.10.bb 35c419193e544a8d85ce740472291aa93c87fd37
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
DESCRIPTION = "SlugOS initial network config via sysconf"
SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r88"
+PR = "r89"
SRC_URI = "file://boot/flash \
file://boot/disk \
============================================================
--- packages/tasks/task-slugos.bb 886169eff4c43655de9f427988ddbe1c01deab8f
+++ packages/tasks/task-slugos.bb 6828037c6d95ea3758b661c5277817df96d75b69
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r14"
+PR = "r15"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -76,6 +76,7 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
# Add modules required for usb support
SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-ehci-hcd \
kernel-module-ohci-hcd \
kernel-module-uhci-hcd \
"
#
# mt diff -r5057b0d0a8cd261e84871fecfebfa818b91794ae -ra5ac78228f6cc50bf85d721b527221474212e68d
#
#
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb"
# content [2e774376b648af5299a532253bd79480809c5e54]
#
# add_file "packages/musicpd/mpd-alsa_svn.bb"
# content [26fa0aeb461eb886fd8c7d354b4d7c8d847cf21e]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [cb21538d71e7331e7d1c8006fb53acbc216f97a3]
# to [1c185c3312e0511c6b64f8626a33d90d4e6a9e8e]
#
# patch "conf/machine/h1910.conf"
# from [24ca3ec1a79acd1bb022db75c3333158c8a72b58]
# to [8c804116d1d1ba9168798328770d1e5de28235f4]
#
# patch "packages/gpsd/files/gpsd"
# from [99883af6595128b4d99f1456e065f5d9916ed8d3]
# to [46761ebb43a976a2d7df3d1f0f1c0c4ea805fb7a]
#
# patch "packages/gpsd/gpsd_2.28.bb"
# from [0bb577497c832b2217b32d3a18e32505d17e9da2]
# to [afa8f306a4567c0d18884e4089b424ac63c0955a]
#
# patch "packages/gpsd/gpsd_2.34.bb"
# from [e0e5afc1235d9fbd17f5724e15fc5f65e1a2e1b7]
# to [4ea8e37b9fbdf1a614c46bcd12247dffa2d96067]
#
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb 2e774376b648af5299a532253bd79480809c5e54
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb 2e774376b648af5299a532253bd79480809c5e54
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r2"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+ file://defconfig"
+
+require linux-handhelds-2.6.inc
============================================================
--- packages/musicpd/mpd-alsa_svn.bb 26fa0aeb461eb886fd8c7d354b4d7c8d847cf21e
+++ packages/musicpd/mpd-alsa_svn.bb 26fa0aeb461eb886fd8c7d354b4d7c8d847cf21e
@@ -0,0 +1,50 @@
+DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support"
+HOMEPAGE = "http://www.musicpd.org"
+SECTION = "console/multimedia"
+LICENSE = "GPLv2"
+DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv"
+RDEPENDS = "libao-alsa"
+PR = "r0"
+
+SRC_URI = "svn://svn.musicpd.org/mpd;module=trunk;proto=https \
+ file://mpd/mpd.init"
+# file://mpd/save-volume-state.patch;patch=1 \
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools update-rc.d
+INITSCRIPT_NAME = "mpd"
+
+# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
+# be built, instead we use the OE built versions which should be installed
+# in staging - remove the --with and replace with --enable to use the local
+# versions.
+
+EXTRA_OECONF = "\
+--disable-ogg \
+--disable-oggvorbis \
+--disable-oggflac \
+--disable-flac \
+--without-faad \
+--with-iconv-libraries=${STAGING_LIBDIR} \
+--with-iconv-includes=${STAGING_INCDIR} \
+--with-ao-libraries=${STAGING_LIBDIR} \
+--with-ao-includes=${STAGING_INCDIR} \
+--with-id3tag-libraries=${STAGING_LIBDIR} \
+--with-id3tag-includes=${STAGING_INCDIR} \
+--with-mad-libraries=${STAGING_LIBDIR} \
+--with-mad-includes=${STAGING_INCDIR} \
+--disable-aotest \
+--disable-alsatest \
+--disable-oggtest \
+--disable-vorbistest \
+--disable-libFLACtest \
+--disable-libOggFLACtest \
+--disable-audiofiletest \
+--disable-libmikmodtest \
+"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd
+}
============================================================
--- conf/distro/angstrom-2007.1.conf cb21538d71e7331e7d1c8006fb53acbc216f97a3
+++ conf/distro/angstrom-2007.1.conf 1c185c3312e0511c6b64f8626a33d90d4e6a9e8e
@@ -217,7 +217,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh16"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh17"
RDEPENDS_kernel-base_hx4700 = ""
RDEPENDS_kernel-base_htcuniversal = ""
============================================================
--- conf/machine/h1910.conf 24ca3ec1a79acd1bb022db75c3333158c8a72b58
+++ conf/machine/h1910.conf 8c804116d1d1ba9168798328770d1e5de28235f4
@@ -21,7 +21,6 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
# Software/packages selection
#
PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
============================================================
--- packages/gpsd/files/gpsd 99883af6595128b4d99f1456e065f5d9916ed8d3
+++ packages/gpsd/files/gpsd 46761ebb43a976a2d7df3d1f0f1c0c4ea805fb7a
@@ -6,10 +6,6 @@
# description: Gpsd manages access to a serial- or USB-connected GPS
# processname: gpsd
-# If you must specify a non-NMEA driver, uncomment and modify the next line
-#GPSD_OPTS=
-GPS_DEV="/dev/ttyS3"
-
# Source function library.
#. /etc/rc.d/init.d/functions
@@ -39,7 +35,7 @@ start() {
echo "success"
else
# User needs to symlink ${GPS_DEV} to the right thing
- echo "No ${GPS_DEV} device, aborting gpsd startup."
+ echo "No ${GPS_DEV} GPS device, aborting gpsd startup. Check /etc/default/$prog"
fi
RETVAL=$?
echo
============================================================
--- packages/gpsd/gpsd_2.28.bb 0bb577497c832b2217b32d3a18e32505d17e9da2
+++ packages/gpsd/gpsd_2.28.bb afa8f306a4567c0d18884e4089b424ac63c0955a
@@ -1,2 +1,2 @@ require gpsd.inc
require gpsd.inc
+PR = "r4"
-PR = "r3"
============================================================
--- packages/gpsd/gpsd_2.34.bb e0e5afc1235d9fbd17f5724e15fc5f65e1a2e1b7
+++ packages/gpsd/gpsd_2.34.bb 4ea8e37b9fbdf1a614c46bcd12247dffa2d96067
@@ -1,4 +1,4 @@ require gpsd.inc
require gpsd.inc
-PR = "r4"
+PR = "r5"
More information about the Openembedded-commits
mailing list