diff options
| -rw-r--r-- | conf/distro/maemo-preferred.inc | 2 | ||||
| -rw-r--r-- | conf/machine/nokia770.conf | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh | 0 | ||||
| -rw-r--r-- | packages/maemo/osso-core-config_200515.1.bb | 8 |
4 files changed, 5 insertions, 9 deletions
diff --git a/conf/distro/maemo-preferred.inc b/conf/distro/maemo-preferred.inc index 6a8c311837..9c087f3b3c 100644 --- a/conf/distro/maemo-preferred.inc +++ b/conf/distro/maemo-preferred.inc @@ -3,3 +3,5 @@ PREFERRED_PROVIDER_tslib = "tslib-maemo" PREFERRED_VERSION_dbus = "0.23.1-osso5" PREFERRED_VERSION_audiofile = "0.2.6-3osso4" PREFERRED_PROVIDER_esd = "osso-esd" +PREFERRED_VERSION_gtk+ = "2.6.4-1.osso7" +PREFERRED_VERSION_diet-x11 ?= "6.2.1"
\ No newline at end of file diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index a228211409..31da23e4fc 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -32,10 +32,10 @@ SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils \ +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils \ +BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils nokia770-init \ pcmcia-cs apm ppp wireless-tools udev-utils console-tools" # NFS Modules diff --git a/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh b/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh index 90dfdb7eb0..90dfdb7eb0 100644..100755 --- a/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh +++ b/packages/maemo/gconf-osso/gconf-daemon-dbus-oe.sh diff --git a/packages/maemo/osso-core-config_200515.1.bb b/packages/maemo/osso-core-config_200515.1.bb index e82e5f092d..42281314ac 100644 --- a/packages/maemo/osso-core-config_200515.1.bb +++ b/packages/maemo/osso-core-config_200515.1.bb @@ -1,6 +1,6 @@ LICENSE = "unknown" MAINTAINER = "Florian Boor <florian@kernelconcepts.de" -PR = "r5" +PR = "r6" DEPENDS = "base-passwd osso-af-startup" RDEPENDS = "base-passwd osso-af-startup" @@ -40,10 +40,4 @@ mkdir -p $MAEMOHOME/MyDocs || true adduser --system --home "$MAEMOHOME" --no-create-home --disabled-password --ingroup "$MAEMOUSER" "$MAEMOUSER" chown -R "$MAEMOUSER"."$MAEMOUSER" "$MAEMOHOME" 2>/dev/null chgrp "$MAEMOUSER" "$MAEMOHOME" 2>/dev/null -# set up some links to firmware and modules in initrd - -mkdir -p /lib/firmware -ln -sf /mnt/initfs/lib/firmware/* /lib/firmware/ -rm -rf /lib/modules -ln -s /mnt/initfs/lib/modules /lib/modules } |