Skip to contentSkip to conversation

cfengine: Add missing dep on bison-native

PATCH New Khem Raj 1 participant 6 messages Mar 30, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/6 cfengine: Add missing dep on bison-native

Fixes
../ylwrap: line 176: yacc: command not found make[2]: *** [Makefile:1016: cf3parse.c] Error 127

---
 meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/cfengine/cfengine_3.15.0.bb +1 -1
index fa08be3e65..2d146bf88c 100644
@@ -13,7 +13,7 @@ HOMEPAGE = "http://cfengine.com"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f"
 
-DEPENDS = "attr tokyocabinet"
+DEPENDS = "attr tokyocabinet bison-native"
 
 SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
            file://set-path-of-default-config-file.patch \
Signature · 1 line
2.26.0
author
#1 lore raw

PATCH 2/6 ttf-inconsolata: Use cp instead of move in do_configure

This helps in re-running do_configure on an existing tree

---
 meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +1 -1
index 20041bb7b3..bf32fedc3b 100644
@@ -14,7 +14,7 @@ FILES_${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \
     ${datadir}/doc/ttf-inconsolata/*"
 
 do_configure() {
-    mv ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf
+    cp -fr ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf
 }
 
 do_install_append() {
Signature · 1 line
2.26.0
author
#2 lore raw

PATCH 3/6 debsums: Depend on po4a-native

In reply to Khem Raj

- Move to perl dynamic-layer since po4a comes from meta-perl
- Add meta-perl dynamic layer

Fixes

cd man && po4a --no-translations po4a.cfg
/bin/sh: po4a: command not found
make: *** [Makefile:11: clean] Error 127

---
 meta-oe/conf/layer.conf                                       | 4 +++-
 .../perl-layer}/recipes-support/debsums/debsums_2.2.2.bb      | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)
 rename meta-oe/{ => dynamic-layers/perl-layer}/recipes-support/debsums/debsums_2.2.2.bb (99%)
meta-oe/conf/layer.conf +3 -1
index 434537fd3a..adcec83029 100644
@@ -25,7 +25,9 @@ BBFILE_PRIORITY_openembedded-layer = "6"
 
 # only activates content when identified layers are present,
 # to ensure yocto compatibility check pass
-BBFILES_DYNAMIC += "meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
+BBFILES_DYNAMIC += " \
+meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
+perl-layer:${LAYERDIR}/dynamic-layers/perl-layer/recipes-*/*/*.bb \
 "
 
 # This should only be incremented on significant changes that will
meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb renamed from meta-oe/recipes-support/debsums/debsums_2.2.2.bb +2 -0
similarity index 99%
rename from meta-oe/recipes-support/debsums/debsums_2.2.2.bb
rename to meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb
index 13f20eb944..07ab5e62b1 100644
@@ -20,6 +20,8 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/"
 
 inherit perlnative gettext
 
+DEPENDS += "po4a-native"
+
 do_install() {
         install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/cron.weekly
         install -d ${D}/${sysconfdir}/cron.monthly ${D}${sbindir} ${D}${bindir}
Signature · 1 line
2.26.0
author
#3 lore raw

PATCH 4/6 tbb: Ensure that install does not race

In reply to Khem Raj

This fixes

install: will not overwrite just-created 'TOPDIR/build/tmp/work/core2-64-yoe-linux/tbb/20170412+AUTOINC+a2cfdfe946-r0/image/usr/lib/libtbbmalloc_proxy.so' with 'TOPDIR/build/tmp/work/core2-64-yoe-linux/tbb/20170412+AUTOINC+a2cfdfe946-r0/git/build/linux_x86_64_gcc_cc4_release/libtbbmalloc_proxy.so'

---
 meta-oe/recipes-support/tbb/tbb.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
meta-oe/recipes-support/tbb/tbb.bb +6 -3
index f870104015..911139b0da 100644
@@ -27,11 +27,14 @@ do_compile() {
 }
 
 do_install() {
-    install -d ${D}${includedir} ${D}${libdir}/pkgconfig
+    install -d ${D}${includedir} ${D}${libdir}
     rm ${S}/include/tbb/index.html -f
     cp -R --no-dereference --preserve=mode,links -v ${S}/include/tbb ${D}${includedir}
-    install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir}
-    install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig
+    for f in ${B}/build/linux_*_release/lib*.so*
+    do
+        install -Dm 0755 $f ${D}${libdir}/
+    done
+    install -Dm 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig/tbb.pc
 }
 
 # fails with thumb enabled:
Signature · 1 line
2.26.0
author
#4 lore raw

PATCH 5/6 id3lib: Make sure that quilt-native is staged

In reply to Khem Raj

id3lib_do_patch needs quilt to be built for it to run

---
 meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
meta-oe/recipes-multimedia/id3lib/id3lib_3.8.3.bb +4 -3
index 9d311608e4..21fa0bda1e 100644
@@ -21,6 +21,7 @@ inherit autotools
 # patches maintained by quilt. So manually apply them before applying other local
 # patches. Also remove all temp files before leaving, because do_patch() will pop
 # up all previously applied patches in the start
+do_patch[depends] += "quilt-native:do_populate_sysroot"
 id3lib_do_patch() {
     cd ${S}
     # it's important that we only pop the existing patches when they've
@@ -33,14 +34,14 @@ id3lib_do_patch() {
         # the test inside which we operate
         QUILT_PATCHES=${S}/patches quilt pop -a
     fi
-    if [ -d ${S}/.pc-id3lib ]; then
+    if [ -d ${S}/.pc-${BPN} ]; then
         rm -rf ${S}/.pc
-        mv ${S}/.pc-id3lib ${S}/.pc
+        mv ${S}/.pc-${BPN} ${S}/.pc
         QUILT_PATCHES=${S}/debian/patches quilt pop -a
         rm -rf ${S}/.pc ${S}/debian
     fi
     QUILT_PATCHES=${S}/debian/patches quilt push -a
-    mv ${S}/.pc ${S}/.pc-id3lib
+    mv ${S}/.pc ${S}/.pc-${BPN}
 }
 
 do_unpack[cleandirs] += "${S}"
Signature · 1 line
2.26.0
author
#5 lore raw

PATCH 6/6 netkit-rwho: Add logic to apply patches from tarball

In reply to Khem Raj

This recipe fetches from debian archives, therefore we need logic to apply the patches which are part of tarball

---
 .../netkit-rwho/netkit-rwho_0.17.bb           | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)
meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +29 -5
index 60a8d95b06..ad543b0fbd 100644
@@ -5,7 +5,7 @@ LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://rwho/rwho.c;beginline=2;endline=3;md5=5a85f13c0142d72fc378e00f15da5b9e"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}.orig.tar.gz;name=archive \
-           ${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}-13.debian.tar.gz;name=patch13 \
+           ${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}-13.debian.tar.gz;subdir=${BP};name=patch13 \
            file://rwhod \
            file://rwhod.default \
            file://0001-Add-missing-include-path-to-I-options.patch \
@@ -20,13 +20,37 @@ inherit autotools-brokensep useradd update-rc.d update-alternatives
 
 CFLAGS += " -D_GNU_SOURCE"
 
-debian_do_patch() {
-    cd ${S}
-    while read line; do patch -p1 < ${WORKDIR}/debian/patches/$line; done < ${WORKDIR}/debian/patches/series
+# Unlike other Debian packages, net-tools *.diff.gz contains another series of
+# patches maintained by quilt. So manually apply them before applying other local
+# patches. Also remove all temp files before leaving, because do_patch() will pop
+# up all previously applied patches in the start
+do_patch[depends] += "quilt-native:do_populate_sysroot"
+netkit_do_patch() {
+        cd ${S}
+        # it's important that we only pop the existing patches when they've
+        # been applied, otherwise quilt will climb the directory tree
+        # and reverse out some completely different set of patches
+        if [ -d ${S}/patches ]; then
+                # whilst this is the default directory, doing it like this
+                # defeats the directory climbing that quilt will otherwise
+                # do; note the directory must exist to defeat this, hence
+                # the test inside which we operate
+                QUILT_PATCHES=${S}/patches quilt pop -a
+        fi
+        if [ -d ${S}/.pc-${BPN} ]; then
+                rm -rf ${S}/.pc
+                mv ${S}/.pc-${BPN} ${S}/.pc
+                QUILT_PATCHES=${S}/debian/patches quilt pop -a
+                rm -rf ${S}/.pc ${S}/debian
+        fi
+        QUILT_PATCHES=${S}/debian/patches quilt push -a
+        mv ${S}/.pc ${S}/.pc-${BPN}
 }
 
+do_unpack[cleandirs] += "${S}"
+
 python do_patch() {
-    bb.build.exec_func('debian_do_patch', d)
+    bb.build.exec_func('netkit_do_patch', d)
     bb.build.exec_func('patch_do_patch', d)
 }
 
Signature · 1 line
2.26.0