Skip to contentSkip to conversation

pbzip2: fix for rebuild

PATCH In review Robert Yang 3 participants 7 messages Apr 8, 2016 – Apr 12, 2016

lore
Share & tools
lore
#0 lore raw

cover pbzip2: fix for rebuild

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(+)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 pbzip2: fix for rebuild

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

---
 meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb +12 -0
index b3c5975..67fb2ef 100644
@@ -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}/
Signature · 1 line
2.7.4
#2 lore raw

meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb do_configure[noexec] = "1" · line 34

Quoted 11 lines · Robert Yang
meta/recipes-extended/pbzip2/pbzip2_1.1.13.bb +10 -0
+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

#3 lore raw
Quoted 2 lines · Ross

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

#4 lore raw
Quoted 7 lines · Ross
Quoted 2 lines · Ross

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

???

Quoted 8 lines

Ross

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw
Quoted 11 lines · Andre McCurdy
Quoted 7 lines · Ross
Quoted 2 lines · Ross

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.

Quoted 16 lines

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

???

Quoted 8 lines

Ross

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw
In reply to Burton, Ross
Quoted 9 lines · Ross

On 11 April 2016 at 15:46, Burton, Ross <[email protected] <mailto:[email protected]>> 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

Quoted 2 lines

Ross