diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-12-20 17:21:51 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-12-20 17:21:51 +0000 |
| commit | 7b2f0f5182290ebfe022a12d5fc1b34f9fbc000c (patch) | |
| tree | 52d8f13c17fdefc57429208a4e1d27ac5473e375 /packages | |
| parent | 5b6afaaee0d760f91d1bb77fd20bc2e2275c097b (diff) | |
| parent | 540f6cd2c373497fa790b31f7b2e195adb3cddea (diff) | |
merge of '0ac48f1fc79ebbccb1647c7d31278fc06fe421ef'
and '96df5dae22f2fb36fef351f22763d1b0524d1dfa'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/images/base-image.bb | 6 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.20.bb | 1 | ||||
| -rw-r--r-- | packages/linux/linux-rp_2.6.21.bb | 2 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-dialer2_svn.bb | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb index 20a5fd9445..36760ec499 100644 --- a/packages/images/base-image.bb +++ b/packages/images/base-image.bb @@ -24,7 +24,8 @@ DEPENDS = "\ task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ - task-base-usbhost task-base-ext2 \ + ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " IMAGE_INSTALL = "\ @@ -32,7 +33,8 @@ IMAGE_INSTALL = "\ task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ - task-base-usbhost task-base-ext2 \ + ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " export IMAGE_BASENAME = "base-image" diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 60305488ca..9ee189e50a 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -3,6 +3,7 @@ require linux-rp.inc PR = "r19" DEFAULT_PREFERENCE_poodle = "-99" +DEFAULT_PREFERENCE_collie = "1" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index d239b2aa32..e388a0c1a4 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -3,7 +3,7 @@ require linux-rp.inc PR = "r12" DEFAULT_PREFERENCE_poodle = "-99" -DEFAULT_PREFERENCE_collie = "1" +DEFAULT_PREFERENCE_collie = "-1" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 171815ef18..c5e6d269d7 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" -DEPENDS = "libjana libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio libnotify" +DEPENDS = "libjana libmokoui2 libmokojournal2 pulseaudio libnotify" PV = "0.1.0+svnr${SRCREV}" PR = "r6" PE = "1" |