[OE-core] [PATCHv2] db: Upgrade to 6.0.35

Wed Sep 28 22:55:54 UTC 2016

$ bitbake -c patch db-native

WARNING: Host distribution "Ubuntu-16.04" has not been validated with 
this version of the build system; you may possibly experience unexpected 
failures. It is recommended that you use a tested distribution.

Loading cache: 100% 
|#############################################################################################################| 
ETA:  00:00:00
Loaded 2112 entries from dependency cache.
Parsing recipes: 100% 
|###########################################################################################################| 
Time: 00:00:03
Parsing of 1584 .bb files complete (1581 cached, 3 parsed). 2113 
targets, 348 skipped, 0 masked, 0 errors.
NOTE: Resolving any missing task queue dependencies

Build Configuration:
BB_VERSION        = "1.30.0"
BUILD_SYS         = "x86_64-linux"
NATIVELSBSTRING   = "universal"
TARGET_SYS        = "arm-poky-linux-gnueabi"
MACHINE           = "lightpixels"
DISTRO            = "poky"
DISTRO_VERSION    = "2.1.1"
TUNE_FEATURES     = "arm armv7ve vfp thumb neon vfpv4 
callconvention-hard cortexa7"
TARGET_FPU        = "hard"
meta
meta-poky
meta-yocto-bsp    = "krogoth:d8582b7a00129175ab11f6f813552ce1a56fc7d7"
meta-raspberrypi  = "master:4817e2c087097c02755d6309304878e42cf61d3c"
meta-qt5          = "krogoth:1ec776771f5f09c97917d3839d8140f9a7668c4a"
meta-oe           = "krogoth:895b25b387cae428c38990f4d2747603ee9dc92d"
meta-lightpixels  = "krogoth:9574f1a4f48c6d057e56e6b471dd65567102de2e"

NOTE: Preparing RunQueue
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks

ERROR: db-native-6.0.30-r0 do_patch: Command Error: 'quilt --quiltrc 
/media/jgueytat/Projects/LightPixels/LightPixels-OperatingSystem/build/tmp/sysroots/x86_64-linux/etc/quiltrc 
push' exited with 1  Output:

Applying patch fix-parallel-build.patch

patching file Makefile.in
Hunk #1 FAILED at 1034.
1 out of 1 hunk FAILED -- rejects in file Makefile.in

Patch fix-parallel-build.patch can be reverse-applied
ERROR: db-native-6.0.30-r0 do_patch: Function failed: patch_do_patch
ERROR: Logfile of failure stored in: 
/media/jgueytat/Projects/LightPixels/LightPixels-OperatingSystem/build/tmp/work/x86_64-linux/db-native/6.0.30-r0/temp/log.do_patch.17684
ERROR: Task 1 
(virtual:native:/media/jgueytat/Projects/LightPixels/LightPixels-OperatingSystem/poky/meta/recipes-support/db/db_6.0.30.bb, 
do_patch) failed with exit code '1'

***********

By applying the patches manually with the patch command it's getting 
better but still:

jgueytat at Happy:~/Sandbox-db/db-6.0.35$ patch -p1 < 
arm-thumb-mutex_db5.patch
patching file src/dbinc/mutex_int.h
jgueytat at Happy:~/Sandbox-db/db-6.0.35$ patch -p0 < fix-parallel-build.patch
patching file dist/Makefile.in
Hunk #1 succeeded at 1041 (offset 7 lines).

#######

It's seems like the patch command accepts the patch even if the offset 
is not respected but not the way it is done during the bitbake -c patch 
db-native command.

=> I thought that two set of patches were needed to respect more 
carefully the line numbers where the changes have to be done.

Le 28/09/2016 à 19:26, Julien Gueytat a écrit :
> Alright! I'm giving you that quickly.
>
> Sent from my WIKO RAINBOW LITE 4GLe 28 sept. 2016 18:58, Aníbal Limón <anibal.limon at linux.intel.com> a écrit :
>>
>>
>> On 09/28/2016 11:30 AM, Julien Gueytat wrote:
>>> Related to the db recipe. There are also the patches that needs to be
>>> regenerated as the same patches are applied for the two current versions.
>>> At least on Ubuntu 16.06 the same patch can't be applied anymore on the
>>> two versions as the lines where to apply the patches differs too much.
>> This is a quite strange, i'm wondering why can't be applied, i expect if
>> a patch fails in configure/compile stages not at patch apply.
>>
>> Could you put here the error log please?
>>
>> alimon
>>
>>>
>>> Le 28/09/2016 18:24, Burton, Ross a écrit :
>>>> On 28 September 2016 at 17:06, Aníbal Limón
>>>> <anibal.limon at linux.intel.com <mailto:anibal.limon at linux.intel.com>>
>>>> wrote:
>>>>
>>>>       @@ -18,16 +18,15 @@ RCONFLICTS_${PN} = "db3"
>>>>        PR = "r1"
>>>>
>>>>
>>>> Remove this PR please.
>>>>
>>>>        # Note, when upgraded to 6.1.x, a patch in RPM will need to be
>>>>       removed to activate db 6.1 support.
>>>>       -
>>>>       -SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz
>>>>       <http://download.oracle.com/berkeley-db/db-$%7BPV%7D.tar.gz> \
>>>>       +SRC_URI = "http://distfiles.gentoo.org/distfiles/db-${PV}.tar.gz
>>>>       <http://distfiles.gentoo.org/distfiles/db-$%7BPV%7D.tar.gz> \
>>>>
>>>>
>>>> What is distfiles.gentoo.org <http://distfiles.gentoo.org>'s policy
>>>> when db-6.0.36 is released?  Could the tarball be deleted the day
>>>> after we release?  In general we've been either using
>>>> snapshot.debian.org <http://snapshot.debian.org> or pointing directly
>>>> at the yoctoproject.org <http://yoctoproject.org> source mirror for
>>>> tarballs we can't rely upon over time.
>>>>
>>>> Ross
>>>>
>>>>
>>>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160929/8951e46b/attachment-0002.html>