diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-03-21 04:03:57 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-21 04:03:57 +0000 |
| commit | 8fd078dda0570f74972431b3fe658679bd707ae6 (patch) | |
| tree | 13a80a63074d0d4660bfd72433bae0aada6e8b0c /packages | |
| parent | 00452481d1147812cfc25b6ab34c79f3d688b340 (diff) | |
| parent | 6fa24f4952e49f8948ee8692513db955d037d29e (diff) | |
merge of '809d7d650e2852bbb5de2df34e3496d61b6c4523'
and '8bc85f8f69f20fd71d7fcd635175b375b7708bb8'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb | 1 | ||||
| -rw-r--r-- | packages/linux/linux-openmoko_2.6.24.bb | 11 |
2 files changed, 8 insertions, 4 deletions
diff --git a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb index 2896079e8e..702e460138 100644 --- a/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb +++ b/packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb @@ -24,6 +24,7 @@ do_compile() { do_stage() { cd gdk-pixbuf && oe_runmake install + find ${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; } do_install() { diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb index b316f4ae4e..8c1f28d2a3 100644 --- a/packages/linux/linux-openmoko_2.6.24.bb +++ b/packages/linux/linux-openmoko_2.6.24.bb @@ -8,8 +8,12 @@ KERNEL_RELEASE = "2.6.24" # need to synchronize with LOCALVERSION, if set KERNEL_VERSION = "${KERNEL_RELEASE}" -PV = "${VANILLA_VERSION}+svnr${SRCREV}" -PR = "r3" +# re-enabled this when feature is fully implemented in OE +#SRCREV_FORMAT = "patches-rconfig" +CONFIG_REV = "4165" + +PV = "${VANILLA_VERSION}+svnr${SRCREV}-r${CONFIG_REV}" +PR = "r4" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" @@ -17,11 +21,10 @@ UBOOT_ENTRYPOINT = "30008000" ############################################################## # source and patches # -SRCREV_FORMAT = "patches-rconfig" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config " + svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;rev=${CONFIG_REV};name=config " S = "${WORKDIR}/linux-${VANILLA_VERSION}" |