[PATCH 0/1] pbzip2: fix for rebuild

[PATCH 0/1] pbzip2: fix for rebuild

[Robert Yang]

The following changes since commit 5ebea1114d54120d5ff5d8a6cd148110d0fda23f:

  build-appliance-image: Update to master head revision (2016-04-06 23:54:57 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/rebuild
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/rebuild

Robert Yang (1):
  pbzip2: fix for rebuild

 meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

-- 
2.7.4

[PATCH 1/1] pbzip2: fix for rebuild

[Robert Yang]

Fixed when rebuild pbzip2:
make: Nothing to be done for `all'

This may cause unexpected errors, for example, when depends libs
changed:
| pbzip2: error while loading shared libraries: libbz2.so.0: cannot open shared object file: No such file or directory

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
index b3c5975..67fb2ef 100644
--- a/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
+++ b/meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb
@@ -22,6 +22,18 @@ do_configure[noexec] = "1"
 
 EXTRA_OEMAKE = "CXX='${CXX} ${CXXFLAGS}' LDFLAGS='${LDFLAGS}'"
 
+do_compile_prepend() {
+    # Update timestamp to fix rebuild
+    src_files="pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp"
+    for f in $src_files; do
+        if [ -f $f ]; then
+            touch $f
+        else
+            bbwarn "Regular file $f not found"
+        fi
+    done
+}
+
 do_install() {
     install -d ${D}${bindir}
     install -m 0755 pbzip2 ${D}${bindir}/
-- 
2.7.4

Re: [PATCH 1/1] pbzip2: fix for rebuild

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

On 8 April 2016 at 04:13, Robert Yang <liezhi.yang@windriver.com> wrote:

> +do_compile_prepend() {
> +    # Update timestamp to fix rebuild
> +    src_files="pbzip2.cpp BZ2StreamScanner.cpp ErrorContext.cpp"
> +    for f in $src_files; do
> +        if [ -f $f ]; then
> +            touch $f
> +        else
> +            bbwarn "Regular file $f not found"
> +        fi
> +    done
>

Wouldn't "oe_runmake clean" be simpler?

Ross

[-- Attachment #2: Type: text/html, Size: 944 bytes --]

Re: [PATCH 1/1] pbzip2: fix for rebuild

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

On 11 April 2016 at 15:46, Burton, Ross <ross.burton@intel.com> wrote:

> Wouldn't "oe_runmake clean" be simpler?
>

Or not disabling do_configure in the recipe, as base.bbclass's do_configure
includes an invocation to make clean.

Ross

[-- Attachment #2: Type: text/html, Size: 623 bytes --]

Re: [PATCH 1/1] pbzip2: fix for rebuild

[Andre McCurdy]

On Mon, Apr 11, 2016 at 7:48 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 11 April 2016 at 15:46, Burton, Ross <ross.burton@intel.com> wrote:
>>
>> Wouldn't "oe_runmake clean" be simpler?
>
> Or not disabling do_configure in the recipe, as base.bbclass's do_configure
> includes an invocation to make clean.

Since the bzip2 source files were changed, updating bzip2's PR (r5 ->
r6) to force a full rebuild of pbzip2 might be a more robust solution?

More curious though is that after cleansstate, pbzip2-native doesn't
build for me at all - the LIC_FILES_CHKSUM is wrong following the
update from pbzip2 1.1.12 -> 1.1.13

  http://git.openembedded.org/openembedded-core/commit/?id=80712b7c0959c197ccb21efd5e7a963d1d2e83ae

???


> Ross
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

Re: [PATCH 1/1] pbzip2: fix for rebuild

[Andre McCurdy]

On Mon, Apr 11, 2016 at 4:43 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> On Mon, Apr 11, 2016 at 7:48 AM, Burton, Ross <ross.burton@intel.com> wrote:
>>
>> On 11 April 2016 at 15:46, Burton, Ross <ross.burton@intel.com> wrote:
>>>
>>> Wouldn't "oe_runmake clean" be simpler?
>>
>> Or not disabling do_configure in the recipe, as base.bbclass's do_configure
>> includes an invocation to make clean.
>
> Since the bzip2 source files were changed, updating bzip2's PR (r5 ->
> r6) to force a full rebuild of pbzip2 might be a more robust solution?

To answer my own question, updating bzip2's PR doesn't help. It's the
pbzip2 recipe which needs fixing.

> More curious though is that after cleansstate, pbzip2-native doesn't
> build for me at all - the LIC_FILES_CHKSUM is wrong following the
> update from pbzip2 1.1.12 -> 1.1.13
>
>   http://git.openembedded.org/openembedded-core/commit/?id=80712b7c0959c197ccb21efd5e7a963d1d2e83ae
>
> ???
>
>> Ross
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>

Re: [PATCH 1/1] pbzip2: fix for rebuild

[Robert Yang]

On 04/11/2016 10:48 PM, Burton, Ross wrote:
>
> On 11 April 2016 at 15:46, Burton, Ross <ross.burton@intel.com
> <mailto:ross.burton@intel.com>> wrote:
>
>     Wouldn't "oe_runmake clean" be simpler?
>
>
> Or not disabling do_configure in the recipe, as base.bbclass's do_configure
> includes an invocation to make clean.

Thanks, Andre McCurdy has sent the patch, thanks.

// Robert

>
> Ross