diff options
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
| -rw-r--r-- | conf/machine/magician.conf | 7 | ||||
| -rw-r--r-- | packages/gnome/gnome-cups-manager_0.31.bb | 3 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6/magician/defconfig | 2 | ||||
| -rw-r--r-- | packages/python/python-pygobject_2.12.2.bb | 5 | ||||
| -rw-r--r-- | packages/python/python-pygtk2_2.10.3.bb | 4 |
6 files changed, 21 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 27e0c78769..46a293235d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -132,7 +132,7 @@ PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.21-hh7" PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" -PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh7" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.21-hh8" PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 719c9a5b03..aa30d3164e 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -34,15 +34,21 @@ XSERVER = "xserver-kdrive-fbdev" PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ + kernel-module-af-key \ + kernel-module-i2c-pxa \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ kernel-module-leds-magician \ kernel-module-magician-ts \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ kernel-module-magician-phone \ + kernel-module-magician-pm \ kernel-module-n-tihtc \ kernel-module-snd-soc-magician" + # # Modules autoload and other boot properties # @@ -54,6 +60,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" module_autoload_magician_ds1wm = "magician_ds1wm" module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" +module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" module_autoload_hci_usb = "hci_usb" diff --git a/packages/gnome/gnome-cups-manager_0.31.bb b/packages/gnome/gnome-cups-manager_0.31.bb index 2023cdac5d..4f8cd1de7b 100644 --- a/packages/gnome/gnome-cups-manager_0.31.bb +++ b/packages/gnome/gnome-cups-manager_0.31.bb @@ -6,6 +6,9 @@ DEPENDS="glib-2.0 gtk+ pango libgnomecups" inherit gnome pkgconfig +FILES += "${datadir}/icons/hicolor/48x48/stock/data/emblem-*.png \ + ${datadir}/icons/hicolor/48x48/devices/gnome-dev-printer-new.png" + SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gnome-cups-manager/0.31/gnome-cups-manager-0.31.tar.bz2" do_stage() { diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig index 17e35c9512..bdc4fa5443 100644 --- a/packages/linux/linux-handhelds-2.6/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6/magician/defconfig @@ -931,7 +931,7 @@ CONFIG_LEDS_MAGICIAN=y # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -CONFIG_LEDS_TRIGGER_HWTIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set CONFIG_LEDS_TRIGGER_SHARED=y diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb index a79032f301..1604b54715 100644 --- a/packages/python/python-pygobject_2.12.2.bb +++ b/packages/python/python-pygobject_2.12.2.bb @@ -9,6 +9,11 @@ S = "${WORKDIR}/pygobject-${PV}" inherit autotools distutils-base pkgconfig +# otherwise the main package keeps snatching the .pc file away +# and therefore depends on glib-2.0-dev (which only the -dev +# package should). +PACKAGES =+ "${PN}-dev" + do_stage() { autotools_stage_all install -d ${STAGING_LIBDIR}/../share/pygobject/ diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk2_2.10.3.bb index d3811ddddd..ad1f36a205 100644 --- a/packages/python/python-pygtk2_2.10.3.bb +++ b/packages/python/python-pygtk2_2.10.3.bb @@ -17,6 +17,10 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../" inherit autotools pkgconfig distutils-base +PACKAGES =+ "${PN}-dev" +FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*" +FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug" + do_configure_prepend() { install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ } |