[PATCH 1/3] pciutils: inherit pkgconfig so that libkmod can be found

[PATCH 1/3] pciutils: inherit pkgconfig so that libkmod can be found

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-bsp/pciutils/pciutils_3.5.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb b/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb
index 8382c84bb18..0051fd8767d 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb
@@ -14,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \
 SRC_URI[md5sum] = "238d9969cc0de8b9105d972007d9d546"
 SRC_URI[sha256sum] = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5"
 
-inherit multilib_header
+inherit multilib_header pkgconfig
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'hwdb', '', d)}"
 PACKAGECONFIG[hwdb] = "HWDB=yes,HWDB=no,udev"
-- 
2.14.1

[PATCH 2/3] subversion: inherit pkgconfig, so that serf can be found

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/recipes-devtools/subversion/subversion_1.9.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/subversion/subversion_1.9.6.bb b/meta/recipes-devtools/subversion/subversion_1.9.6.bb
index b27115b981f..f49e26a5c8c 100644
--- a/meta/recipes-devtools/subversion/subversion_1.9.6.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.9.6.bb
@@ -8,7 +8,7 @@ HOMEPAGE = "http://subversion.tigris.org"
 
 BBCLASSEXTEND = "native"
 
-inherit gettext
+inherit gettext pkgconfig
 
 SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://disable_macos.patch \
-- 
2.14.1

Re: [PATCH 2/3] subversion: inherit pkgconfig, so that serf can be found

[Richard Purdie]

On Tue, 2017-08-29 at 14:45 +0300, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>  meta/recipes-devtools/subversion/subversion_1.9.6.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/subversion/subversion_1.9.6.bb
> b/meta/recipes-devtools/subversion/subversion_1.9.6.bb
> index b27115b981f..f49e26a5c8c 100644
> --- a/meta/recipes-devtools/subversion/subversion_1.9.6.bb
> +++ b/meta/recipes-devtools/subversion/subversion_1.9.6.bb
> @@ -8,7 +8,7 @@ HOMEPAGE = "http://subversion.tigris.org"
>  
>  BBCLASSEXTEND = "native"
>  
> -inherit gettext
> +inherit gettext pkgconfig
>  
>  SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
>             file://disable_macos.patch \

Any idea why we haven't had errors from this? Did it mean we just lost
something like https support?

Cheers,

Richard

Re: [PATCH 2/3] subversion: inherit pkgconfig, so that serf can be found

[Alexander Kanavin]

On 08/29/2017 03:49 PM, Richard Purdie wrote:

>> --- a/meta/recipes-devtools/subversion/subversion_1.9.6.bb
>> +++ b/meta/recipes-devtools/subversion/subversion_1.9.6.bb
>> @@ -8,7 +8,7 @@ HOMEPAGE = "http://subversion.tigris.org"
>>   
>>   BBCLASSEXTEND = "native"
>>   
>> -inherit gettext
>> +inherit gettext pkgconfig
>>   
>>   SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
>>              file://disable_macos.patch \
> 
> Any idea why we haven't had errors from this? Did it mean we just lost
> something like https support?

We didn't get errors because subversion's build system didn't deem 
absence of pkgconfig (and thus, disabling of serf) an error. Also, I 
think we no longer have any recipes in oe-core that fetch from svn, so 
nothing is testing that subversion-native does in fact work.

How necessary is subversion nowadays for those company-internal repos?

Alex

Re: [PATCH 2/3] subversion: inherit pkgconfig, so that serf can be found

[Martin Jansa]

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

Dejavu

http://lists.openembedded.org/pipermail/openembedded-core/2014-July/094942.html

it might be less likely to trigger in internal builds, because we use some
old components from svn, but because they weren't updated in ages, we still
use the same archive from premirror.

There are few recipes in meta-oe and meta-multimedia layers:
meta-multimedia/recipes-dvb/oscam/oscam_svn.bb:SRC_URI = "svn://
www.streamboard.tv/svn/oscam;module=trunk;protocol=http \
meta-multimedia/recipes-multimedia/tremor/tremor_20150107.bb:SRC_URI =
"svn://svn.xiph.org/trunk;module=Tremor;rev=19427;protocol=http \
meta-oe/recipes-support/samsung-soc-utils/s3c24xx-gpio_svn.bb:SRC_URI =
"svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http"
meta-oe/recipes-support/samsung-soc-utils/s3c64xx-gpio_svn.bb:SRC_URI =
"svn://svn.openmoko.org/trunk/src/target;module=gpio;protocol=http"
meta-oe/recipes-support/samsung-soc-utils/sjf2410-linux-native_svn.bb:SRC_URI
= "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;protocol=http
"
meta-oe/recipes-support/usbpath/usbpath_svn.bb:SRC_URI = "svn://
svn.openmoko.org/trunk/src/host;module=usbpath;protocol=http \
meta-oe/recipes-support/wmiconfig/wmiconfig_svn.bb:SRC_URI = "svn://
svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;protocol=http \

Regards,

On Tue, Aug 29, 2017 at 2:57 PM, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:

> On 08/29/2017 03:49 PM, Richard Purdie wrote:
>
> --- a/meta/recipes-devtools/subversion/subversion_1.9.6.bb
>>> +++ b/meta/recipes-devtools/subversion/subversion_1.9.6.bb
>>> @@ -8,7 +8,7 @@ HOMEPAGE = "http://subversion.tigris.org"
>>>     BBCLASSEXTEND = "native"
>>>   -inherit gettext
>>> +inherit gettext pkgconfig
>>>     SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
>>>              file://disable_macos.patch \
>>>
>>
>> Any idea why we haven't had errors from this? Did it mean we just lost
>> something like https support?
>>
>
> We didn't get errors because subversion's build system didn't deem absence
> of pkgconfig (and thus, disabling of serf) an error. Also, I think we no
> longer have any recipes in oe-core that fetch from svn, so nothing is
> testing that subversion-native does in fact work.
>
> How necessary is subversion nowadays for those company-internal repos?
>
> Alex
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

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

[PATCH 3/3] signing-keys: do not use DISTRO_VERSION in key names

[Alexander Kanavin]

DISTRO_VERSION may contain the current date, and so is prone to mismatches
particularly when keys are created on one date, and dnf is configured to use the keys
on another date.

[YOCTO #11983]

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 meta/lib/oe/package_manager.py         |  2 +-
 meta/recipes-core/meta/signing-keys.bb | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index d43d729203b..ef068813110 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -561,7 +561,7 @@ class RpmPM(PackageManager):
 
         if self.d.getVar('PACKAGE_FEED_SIGN') == '1':
             gpg_opts = 'repo_gpgcheck=1\n'
-            gpg_opts += 'gpgkey=file://%s/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-%s\n' % (self.d.getVar('sysconfdir'), self.d.getVar('DISTRO_VERSION'))
+            gpg_opts += 'gpgkey=file://%s/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-%s-%s\n' % (self.d.getVar('sysconfdir'), self.d.getVar('DISTRO'), self.d.getVar('DISTRO_CODENAME'))
         else:
             gpg_opts = ''
 
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb
index ebfb08c433b..2c1cc3845ea 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/meta/recipes-core/meta/signing-keys.bb
@@ -44,25 +44,25 @@ addtask get_public_keys before do_install
 
 do_install () {
     if [ -f "${B}/rpm-key" ]; then
-        install -D -m 0644 "${B}/rpm-key" "${D}${sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-${DISTRO_VERSION}"
+        install -D -m 0644 "${B}/rpm-key" "${D}${sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
     fi
     if [ -f "${B}/ipk-key" ]; then
-        install -D -m 0644 "${B}/ipk-key" "${D}${sysconfdir}/pki/ipk-gpg/IPK-GPG-KEY-${DISTRO_VERSION}"
+        install -D -m 0644 "${B}/ipk-key" "${D}${sysconfdir}/pki/ipk-gpg/IPK-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
     fi
     if [ -f "${B}/pf-key" ]; then
-        install -D -m 0644 "${B}/pf-key" "${D}${sysconfdir}/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-${DISTRO_VERSION}"
+        install -D -m 0644 "${B}/pf-key" "${D}${sysconfdir}/pki/packagefeed-gpg/PACKAGEFEED-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
     fi
 }
 
 do_deploy () {
     if [ -f "${B}/rpm-key" ]; then
-        install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO_VERSION}"
+        install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
     fi
     if [ -f "${B}/ipk-key" ]; then
-        install -D -m 0644 "${B}/ipk-key" "${DEPLOYDIR}/IPK-GPG-KEY-${DISTRO_VERSION}"
+        install -D -m 0644 "${B}/ipk-key" "${DEPLOYDIR}/IPK-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
     fi
     if [ -f "${B}/pf-key" ]; then
-        install -D -m 0644 "${B}/pf-key" "${DEPLOYDIR}/PACKAGEFEED-GPG-KEY-${DISTRO_VERSION}"
+        install -D -m 0644 "${B}/pf-key" "${DEPLOYDIR}/PACKAGEFEED-GPG-KEY-${DISTRO}-${DISTRO_CODENAME}"
     fi
 }
 do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_RPM}"
-- 
2.14.1