diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-09-27 14:09:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-28 07:59:35 +0100 |
commit | b04316bdd28b7945c2c91b4e43c007b650eedc14 (patch) | |
tree | e38cefefd29bc91b00f88d764f3969f679806c32 /meta/recipes-extended | |
parent | afa57a02ecd12ad176302d9631f4181b26d94f5c (diff) | |
download | openembedded-core-contrib-b04316bdd28b7945c2c91b4e43c007b650eedc14.tar.gz |
meta: fix version checks in all github recipes using the github-releases class
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/cronie/cronie_1.6.1.bb | 7 | ||||
-rw-r--r-- | meta/recipes-extended/cups/cups.inc | 7 | ||||
-rw-r--r-- | meta/recipes-extended/logrotate/logrotate_3.20.1.bb | 7 | ||||
-rw-r--r-- | meta/recipes-extended/pam/libpam_1.5.2.bb | 6 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 6 |
5 files changed, 15 insertions, 18 deletions
diff --git a/meta/recipes-extended/cronie/cronie_1.6.1.bb b/meta/recipes-extended/cronie/cronie_1.6.1.bb index 6d150dd3c7..078187534e 100644 --- a/meta/recipes-extended/cronie/cronie_1.6.1.bb +++ b/meta/recipes-extended/cronie/cronie_1.6.1.bb @@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dd2a592170760e1386c769e1043b3722 \ SECTION = "utils" -UPSTREAM_CHECK_URI = "https://github.com/cronie-crond/${BPN}/releases/" +GITHUB_BASE_URI = "https://github.com/cronie-crond/${BPN}/releases/" -SRC_URI = "https://github.com/cronie-crond/cronie/releases/download/cronie-${PV}/cronie-${PV}.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/cronie-${PV}/cronie-${PV}.tar.gz \ file://crond.init \ file://crontab \ file://crond.service \ @@ -27,7 +27,8 @@ PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" SRC_URI[sha256sum] = "2cd0f0dd1680e6b9c39bf1e3a5e7ad6df76aa940de1ee90a453633aa59984e62" -inherit autotools update-rc.d useradd systemd +inherit autotools update-rc.d useradd systemd github-releases +UPSTREAM_CHECK_REGEX = "releases/tag/cronie-(?P<pver>\d+(\.\d+)+)" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 4592980766..9c920bb133 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -8,7 +8,7 @@ SECTION = "console/utils" LICENSE = "Apache-2.0" DEPENDS = "libpng jpeg dbus zlib libusb1" -SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${PV}-source.tar.gz \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ file://0001-use-echo-only-in-init.patch \ file://0002-don-t-try-to-run-generated-binaries.patch \ file://libexecdir.patch \ @@ -17,8 +17,7 @@ SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${ file://cups-volatiles.conf \ " -UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases" -UPSTREAM_CHECK_REGEX = "cups-(?P<pver>(?!.+\d(b|rc)\d.+).+)-source.tar" +GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases" # Issue only applies to MacOS CVE_CHECK_IGNORE += "CVE-2008-1033" @@ -33,7 +32,7 @@ LEAD_SONAME = "libcupsdriver.so" CLEANBROKEN = "1" -inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script +inherit autotools-brokensep binconfig useradd systemd pkgconfig multilib_script github-releases USERADD_PACKAGES = "${PN}" GROUPADD_PARAM:${PN} = "--system lpadmin" diff --git a/meta/recipes-extended/logrotate/logrotate_3.20.1.bb b/meta/recipes-extended/logrotate/logrotate_3.20.1.bb index 35977535aa..034c37b429 100644 --- a/meta/recipes-extended/logrotate/logrotate_3.20.1.bb +++ b/meta/recipes-extended/logrotate/logrotate_3.20.1.bb @@ -10,10 +10,7 @@ DEPENDS="coreutils popt" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" -UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar" - -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.xz" SRC_URI[sha256sum] = "742f6d6e18eceffa49a4bacd933686d3e42931cfccfb694d7f6369b704e5d094" @@ -47,7 +44,7 @@ EXTRA_OEMAKE = "\ # INSTALL=install and BASEDIR=/usr. OS_NAME = "Linux" -inherit autotools systemd +inherit autotools systemd github-releases SYSTEMD_SERVICE:${PN} = "\ ${BPN}.service \ diff --git a/meta/recipes-extended/pam/libpam_1.5.2.bb b/meta/recipes-extended/pam/libpam_1.5.2.bb index 081986ef43..bde7fef8a2 100644 --- a/meta/recipes-extended/pam/libpam_1.5.2.bb +++ b/meta/recipes-extended/pam/libpam_1.5.2.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ file://libpamc/License;md5=a4da476a14c093fdc73be3c3c9ba8fb3 \ " -SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux-PAM-${PV}.tar.xz \ +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/Linux-PAM-${PV}.tar.xz \ file://99_pam \ file://pam.d/common-account \ file://pam.d/common-auth \ @@ -42,7 +42,7 @@ CFLAGS:append = " -fPIC " S = "${WORKDIR}/Linux-PAM-${PV}" -inherit autotools gettext pkgconfig systemd ptest +inherit autotools gettext pkgconfig systemd ptest github-releases PACKAGECONFIG ??= "" PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," @@ -180,6 +180,6 @@ CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-session-noninteractive" CONFFILES:${PN}-runtime += "${sysconfdir}/pam.d/common-account" CONFFILES:${PN}-runtime += "${sysconfdir}/security/limits.conf" -UPSTREAM_CHECK_URI = "https://github.com/linux-pam/linux-pam/releases" +GITHUB_BASE_URI = "https://github.com/linux-pam/linux-pam/releases" CVE_PRODUCT = "linux-pam" diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index 414bf467ba..a87e23569b 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9a450b7be84eac23e6353efecb60b5b \ DEPENDS = "virtual/crypt" -UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" -SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \ +GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases" +SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ file://0001-shadow-use-relaxed-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ @@ -42,7 +42,7 @@ PAM_SRC_URI = "file://pam.d/chfn \ file://pam.d/passwd \ file://pam.d/su" -inherit autotools gettext +inherit autotools gettext github-releases export CONFIG_SHELL="/bin/sh" |