diff options
| -rw-r--r-- | conf/distro/openwrt-sdk.conf | 26 | ||||
| -rw-r--r-- | conf/machine/fic-gta01.conf | 2 | ||||
| -rw-r--r-- | conf/machine/fic-gta02.conf | 2 | ||||
| -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 |
7 files changed, 35 insertions, 6 deletions
diff --git a/conf/distro/openwrt-sdk.conf b/conf/distro/openwrt-sdk.conf new file mode 100644 index 0000000000..fc760f9ea0 --- /dev/null +++ b/conf/distro/openwrt-sdk.conf @@ -0,0 +1,26 @@ +#----------------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: OpenWRT-SDK +#@DESCRIPTION: Building packages for OpenWRT using its official SDK. +# +#@COMMENT: This allows to build packages only, not the whole images. +#@COMMENT: You should install and have in path an SDK from the www.openwrt.org. +#@COMMENT: SDK installers are both host and target specific (so look in download +#@COMMENT: dir for your target). If there is no SDK for your host arch, +#@COMMENT: you can also look at downloads of x-wrt.org, a sister project. +#@COMMENT: To build a package, use command like: +#@COMMENT: DISTRO=openwrt-sdk TARGET_ARCH=<arch> bitbake <package> +#----------------------------------------------------------------------------- + +require conf/distro/generic-uclibc.conf + +# +# Header +# +DISTRO_NAME = "OpenWRT" + +# This is what lives in SDK +ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" + +# Make sure that we have correct package dependencies for SDK-provided libs. +ASSUME_SHLIBS += "libc.so.0:uclibc libgcc_s.so.1:libgcc" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 30784f0dc6..68bf1b9025 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index b0933868c2..25c3878ee3 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" 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" |