diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-06-16 11:12:45 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-06-16 11:12:45 +0000 |
| commit | 3981575226bc2a1f5aaaf829139005e443eec8ba (patch) | |
| tree | 00f9e649183757754b47f6a71a12f50be5eb82ab | |
| parent | 72ceea61a2d4f8164a176eafed61cc881bbd35cb (diff) | |
| parent | 84f9800efbfe76049ca1b2faeb27831cad5bb72d (diff) | |
merge of '02ce8fba2c16b03770277a744efebc4f9c0f7f47'
and '1ca4c522d6f876b0f973239befedba5f6ad6ab07'
| -rw-r--r-- | classes/insane.bbclass | 3 | ||||
| -rw-r--r-- | conf/machine/hx4700.conf | 2 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 4 | ||||
| -rw-r--r-- | packages/pulseaudio/pulseaudio-alsa-wrapper.bb | 6 |
4 files changed, 13 insertions, 2 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 1f7c761b47..a599689e8c 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -72,6 +72,9 @@ def package_qa_get_machine_dict(): "arm" : (40, 0, 0, True, True), "armeb" : (40, 0, 0, False, True), }, + "linux-gnuspe" : { + "powerpc": (20, 0, 0, False, True), + }, } diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 0d3a9bbcf0..785214409f 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -8,6 +8,8 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt " +IMAGE_FSTYPES += "jffs2" + # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.inc diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 4b4e14c959..2927bc6d7b 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -188,7 +188,6 @@ SLUGOS_PACKAGES = "\ pkgconfig \ popt \ portmap \ - postfix \ ppp \ procps \ psmisc \ @@ -244,7 +243,6 @@ SLUGOS_PACKAGES = "\ wview-vpro \ wview-wxt510 \ xinetd \ - yeaphone \ yp-tools ypbind ypserv \ zd1211-firmware \ zip \ @@ -263,6 +261,7 @@ SLUGOS_BROKEN_PACKAGES = "\ madfu \ motion \ openldap \ + postfix \ pwc \ qc-usb-messenger \ spandsp \ @@ -270,6 +269,7 @@ SLUGOS_BROKEN_PACKAGES = "\ task-native-sdk \ unionfs-modules unionfs-utils \ wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \ + yeaphone \ zd1211 \ " diff --git a/packages/pulseaudio/pulseaudio-alsa-wrapper.bb b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb index 7a287da773..e555d50075 100644 --- a/packages/pulseaudio/pulseaudio-alsa-wrapper.bb +++ b/packages/pulseaudio/pulseaudio-alsa-wrapper.bb @@ -1,6 +1,8 @@ DESCRIPTION = "Meta package to make alsa transparently use pulseaudio" LICENSE = "GPLv2" +PR = "r1" + SRC_URI = "file://asound.conf.pulseaudio" RDEPENDS = "hal \ @@ -9,6 +11,10 @@ RDEPENDS = "hal \ pulseaudio-module-alsa-sink \ pulseaudio-module-alsa-source \ pulseaudio-module-hal-detect \ + pulseaudio-module-volume-restore \ + pulseaudio-module-default-device-restore \ + pulseaudio-module-rescue-streams \ + pulseaudio-module-suspend-on-idle \ libasound-module-ctl-pulse \ libasound-module-pcm-pulse \ " |