Re: [OE-core] [Dunfell][PATCH] dbus: Security fix CVE-2020-35512
On Thu, Sep 2, 2021 at 8:38 AM Steve Sakoman wrote: > > On Thu, Sep 2, 2021 at 8:10 AM Armin Kuster wrote: > > > > ping or did I miss a response to this patch? > > No you didn't miss anything! > > I mistakenly stashed this patch along with your "lz4: Security Fix for > CVE-2021-3520" patch in a branch waiting for the lz4 equivalent to hit > master. > > Richard pushed the lz4 patch to master so now both patches are merged > and in test for dunfell. We're getting reproducible autobuilder ptest errors with this patch: AssertionError: Failed ptests: {'dbus-test': ['test/test-dbus-daemon', 'test/test-dbus-daemon-eavesdrop', 'test/test-monitor']} https://autobuilder.yoctoproject.org/typhoon/#/builders/82/builds/2179 https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/2460 Steve > > -armin > > > > On 8/27/21 8:37 PM, Armin Kuster via lists.openembedded.org wrote: > > > From: Armin Kuster > > > > > > Source: https://gitlab.freedesktop.org/dbu > > > MR: 108825 > > > Type: Security Fix > > > Disposition: Backport from > > > https://gitlab.freedesktop.org/dbus/dbus/-/commit/e75c67a28fa2bc41a8ab0de433a52355c71a8abf > > > ChangeID: dea9518b9c13dab66e7d553c622000b9c6e268cc > > > Description: > > > > > > Affects: < 1.12.20 > > > > > > Signed-off-by: Armin Kuster > > > --- > > > .../dbus/dbus/CVE-2020-35512.patch| 301 ++ > > > meta/recipes-core/dbus/dbus_1.12.16.bb| 1 + > > > 2 files changed, 302 insertions(+) > > > create mode 100644 meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > > > > > diff --git a/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > > b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > > new file mode 100644 > > > index 00..27f5d58675 > > > --- /dev/null > > > +++ b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > > @@ -0,0 +1,301 @@ > > > +From 2b7948ef907669e844b52c4fa2268d6e3162a70c Mon Sep 17 00:00:00 2001 > > > +From: Simon McVittie > > > +Date: Tue, 30 Jun 2020 19:29:06 +0100 > > > +Subject: [PATCH] userdb: Reference-count DBusUserInfo, DBusGroupInfo > > > + > > > +Previously, the hash table indexed by uid (or gid) took ownership of the > > > +single reference to the heap-allocated struct, and the hash table > > > +indexed by username (or group name) had a borrowed pointer to the same > > > +struct that exists in the other hash table. > > > + > > > +However, this can break down if you have two or more distinct usernames > > > +that share a numeric identifier. This is generally a bad idea, because > > > +the user-space model in such situations does not match the kernel-space > > > +reality, and in particular there is no effective kernel-level security > > > +boundary between such users, but it is sometimes done anyway. > > > + > > > +In this case, when the second username is looked up in the userdb, it > > > +overwrites (replaces) the entry in the hash table that is indexed by > > > +uid, freeing the DBusUserInfo. This results in both the key and the > > > +value in the hash table that is indexed by username becoming dangling > > > +pointers (use-after-free), leading to undefined behaviour, which is > > > +certainly not what we want to see when doing access control. > > > + > > > +An equivalent situation can occur with groups, in the rare case where > > > +a numeric group ID has two names (although I have not heard of this > > > +being done in practice). > > > + > > > +Solve this by reference-counting the data structure. There are up to > > > +three references in practice: one held temporarily while the lookup > > > +function is populating and storing it, one held by the hash table that > > > +is indexed by uid, and one held by the hash table that is indexed by > > > +name. > > > + > > > +Closes: dbus#305 > > > +Signed-off-by: Simon McVittie > > > + > > > +Upsteam-Status: Backport > > > +https://gitlab.freedesktop.org/dbus/dbus/-/commit/e75c67a28fa2bc41a8ab0de433a52355c71a8abf > > > +CVE: CVE-2020-35512 > > > +Signed-off-by: Armin Kuster > > > + > > > +--- > > > + dbus/dbus-sysdeps-unix.h | 2 ++ > > > + dbus/dbus-userdb-util.c | 38 ++- > > > + dbus/dbus-userdb.c | 67 ++-- > > > + dbus/dbus-userdb.h | 6 ++-- > > > + 4 files changed, 86 insertions(+), 27 deletions(-) > > > + > > > +Index: dbus-1.12.16/dbus/dbus-sysdeps-unix.h > > > +=== > > > +--- dbus-1.12.16.orig/dbus/dbus-sysdeps-unix.h > > > dbus-1.12.16/dbus/dbus-sysdeps-unix.h > > > +@@ -105,6 +105,7 @@ typedef struct DBusGroupInfo DBusGroupIn > > > + */ > > > + struct DBusUserInfo > > > + { > > > ++ size_t refcount; /**< Reference count */ > > > + dbus_uid_t uid;/**< UID */ > > > + dbus_gid_t primary_gid;/**< GID */ > > > + dbus_gid_t *group_ids; /**< Groups IDs, *including* above > > > primary group */ > > > +@@ -118,6 +119,7 @@ struct
[OE-core] [PATCH] diffoscope: upgrade 181 -> 182
Signed-off-by: Wang Mingyu --- .../diffoscope/{diffoscope_181.bb => diffoscope_182.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-support/diffoscope/{diffoscope_181.bb => diffoscope_182.bb} (92%) diff --git a/meta/recipes-support/diffoscope/diffoscope_181.bb b/meta/recipes-support/diffoscope/diffoscope_182.bb similarity index 92% rename from meta/recipes-support/diffoscope/diffoscope_181.bb rename to meta/recipes-support/diffoscope/diffoscope_182.bb index 8b2f3cc826..d5875423c4 100644 --- a/meta/recipes-support/diffoscope/diffoscope_181.bb +++ b/meta/recipes-support/diffoscope/diffoscope_182.bb @@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" inherit pypi setuptools3 -SRC_URI[sha256sum] = "a295024acf713c58693c152f9a43fae268c08078f60ba502a7947b7840ece5d7" +SRC_URI[sha256sum] = "5969c6f0060c5c553e5ae9fdff45fbd344f102ee8fb2c5673cf0c73999c50df4" RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155644): https://lists.openembedded.org/g/openembedded-core/message/155644 Mute This Topic: https://lists.openembedded.org/mt/85343317/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] wayland-protocols: upgrade 1.21 -> 1.22
wayland-protocols 1.22 is now available. This release includes a new staging protocol: DRM object leasing. Besides that, various test and build system improvements are included, as well as a set of clarifications to the xdg-activation protocol and other protocols. https://lists.freedesktop.org/archives/wayland-devel/2021-September/041972.html Signed-off-by: Denys Dmytriyenko --- .../wayland/{wayland-protocols_1.21.bb => wayland-protocols_1.22.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/wayland/{wayland-protocols_1.21.bb => wayland-protocols_1.22.bb} (90%) diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.21.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.22.bb similarity index 90% rename from meta/recipes-graphics/wayland/wayland-protocols_1.21.bb rename to meta/recipes-graphics/wayland/wayland-protocols_1.22.bb index 4a5a295..4e8d390 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.21.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.22.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ " -SRC_URI[sha256sum] = "b99945842d8be18817c26ee77dafa157883af89268e15f4a5a1a1ff3ffa4cde5" +SRC_URI[sha256sum] = "96e7cf03524995a47028236c6d6141c874e693cb80c0be8dabe15455cdd5a5a7" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html; -- 2.7.4 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155643): https://lists.openembedded.org/g/openembedded-core/message/155643 Mute This Topic: https://lists.openembedded.org/mt/85339456/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [Dunfell][PATCH] dbus: Security fix CVE-2020-35512
On Thu, Sep 2, 2021 at 8:10 AM Armin Kuster wrote: > > ping or did I miss a response to this patch? No you didn't miss anything! I mistakenly stashed this patch along with your "lz4: Security Fix for CVE-2021-3520" patch in a branch waiting for the lz4 equivalent to hit master. Richard pushed the lz4 patch to master so now both patches are merged and in test for dunfell. Thanks! Steve > > -armin > > On 8/27/21 8:37 PM, Armin Kuster via lists.openembedded.org wrote: > > From: Armin Kuster > > > > Source: https://gitlab.freedesktop.org/dbu > > MR: 108825 > > Type: Security Fix > > Disposition: Backport from > > https://gitlab.freedesktop.org/dbus/dbus/-/commit/e75c67a28fa2bc41a8ab0de433a52355c71a8abf > > ChangeID: dea9518b9c13dab66e7d553c622000b9c6e268cc > > Description: > > > > Affects: < 1.12.20 > > > > Signed-off-by: Armin Kuster > > --- > > .../dbus/dbus/CVE-2020-35512.patch| 301 ++ > > meta/recipes-core/dbus/dbus_1.12.16.bb| 1 + > > 2 files changed, 302 insertions(+) > > create mode 100644 meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > > > diff --git a/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > new file mode 100644 > > index 00..27f5d58675 > > --- /dev/null > > +++ b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > @@ -0,0 +1,301 @@ > > +From 2b7948ef907669e844b52c4fa2268d6e3162a70c Mon Sep 17 00:00:00 2001 > > +From: Simon McVittie > > +Date: Tue, 30 Jun 2020 19:29:06 +0100 > > +Subject: [PATCH] userdb: Reference-count DBusUserInfo, DBusGroupInfo > > + > > +Previously, the hash table indexed by uid (or gid) took ownership of the > > +single reference to the heap-allocated struct, and the hash table > > +indexed by username (or group name) had a borrowed pointer to the same > > +struct that exists in the other hash table. > > + > > +However, this can break down if you have two or more distinct usernames > > +that share a numeric identifier. This is generally a bad idea, because > > +the user-space model in such situations does not match the kernel-space > > +reality, and in particular there is no effective kernel-level security > > +boundary between such users, but it is sometimes done anyway. > > + > > +In this case, when the second username is looked up in the userdb, it > > +overwrites (replaces) the entry in the hash table that is indexed by > > +uid, freeing the DBusUserInfo. This results in both the key and the > > +value in the hash table that is indexed by username becoming dangling > > +pointers (use-after-free), leading to undefined behaviour, which is > > +certainly not what we want to see when doing access control. > > + > > +An equivalent situation can occur with groups, in the rare case where > > +a numeric group ID has two names (although I have not heard of this > > +being done in practice). > > + > > +Solve this by reference-counting the data structure. There are up to > > +three references in practice: one held temporarily while the lookup > > +function is populating and storing it, one held by the hash table that > > +is indexed by uid, and one held by the hash table that is indexed by > > +name. > > + > > +Closes: dbus#305 > > +Signed-off-by: Simon McVittie > > + > > +Upsteam-Status: Backport > > +https://gitlab.freedesktop.org/dbus/dbus/-/commit/e75c67a28fa2bc41a8ab0de433a52355c71a8abf > > +CVE: CVE-2020-35512 > > +Signed-off-by: Armin Kuster > > + > > +--- > > + dbus/dbus-sysdeps-unix.h | 2 ++ > > + dbus/dbus-userdb-util.c | 38 ++- > > + dbus/dbus-userdb.c | 67 ++-- > > + dbus/dbus-userdb.h | 6 ++-- > > + 4 files changed, 86 insertions(+), 27 deletions(-) > > + > > +Index: dbus-1.12.16/dbus/dbus-sysdeps-unix.h > > +=== > > +--- dbus-1.12.16.orig/dbus/dbus-sysdeps-unix.h > > dbus-1.12.16/dbus/dbus-sysdeps-unix.h > > +@@ -105,6 +105,7 @@ typedef struct DBusGroupInfo DBusGroupIn > > + */ > > + struct DBusUserInfo > > + { > > ++ size_t refcount; /**< Reference count */ > > + dbus_uid_t uid;/**< UID */ > > + dbus_gid_t primary_gid;/**< GID */ > > + dbus_gid_t *group_ids; /**< Groups IDs, *including* above primary > > group */ > > +@@ -118,6 +119,7 @@ struct DBusUserInfo > > + */ > > + struct DBusGroupInfo > > + { > > ++ size_t refcount; /**< Reference count */ > > + dbus_gid_t gid;/**< GID */ > > + char *groupname; /**< Group name */ > > + }; > > +Index: dbus-1.12.16/dbus/dbus-userdb-util.c > > +=== > > +--- dbus-1.12.16.orig/dbus/dbus-userdb-util.c > > dbus-1.12.16/dbus/dbus-userdb-util.c > > +@@ -38,6 +38,15 @@ > > + * @{ > > + */ > > + > > ++static DBusGroupInfo * > > ++_dbus_group_info_ref (DBusGroupInfo *info) > > ++{ > > ++ _dbus_assert (info->refcount
Re: [OE-core] [Dunfell][PATCH] dbus: Security fix CVE-2020-35512
ping or did I miss a response to this patch? -armin On 8/27/21 8:37 PM, Armin Kuster via lists.openembedded.org wrote: > From: Armin Kuster > > Source: https://gitlab.freedesktop.org/dbu > MR: 108825 > Type: Security Fix > Disposition: Backport from > https://gitlab.freedesktop.org/dbus/dbus/-/commit/e75c67a28fa2bc41a8ab0de433a52355c71a8abf > ChangeID: dea9518b9c13dab66e7d553c622000b9c6e268cc > Description: > > Affects: < 1.12.20 > > Signed-off-by: Armin Kuster > --- > .../dbus/dbus/CVE-2020-35512.patch| 301 ++ > meta/recipes-core/dbus/dbus_1.12.16.bb| 1 + > 2 files changed, 302 insertions(+) > create mode 100644 meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > > diff --git a/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > new file mode 100644 > index 00..27f5d58675 > --- /dev/null > +++ b/meta/recipes-core/dbus/dbus/CVE-2020-35512.patch > @@ -0,0 +1,301 @@ > +From 2b7948ef907669e844b52c4fa2268d6e3162a70c Mon Sep 17 00:00:00 2001 > +From: Simon McVittie > +Date: Tue, 30 Jun 2020 19:29:06 +0100 > +Subject: [PATCH] userdb: Reference-count DBusUserInfo, DBusGroupInfo > + > +Previously, the hash table indexed by uid (or gid) took ownership of the > +single reference to the heap-allocated struct, and the hash table > +indexed by username (or group name) had a borrowed pointer to the same > +struct that exists in the other hash table. > + > +However, this can break down if you have two or more distinct usernames > +that share a numeric identifier. This is generally a bad idea, because > +the user-space model in such situations does not match the kernel-space > +reality, and in particular there is no effective kernel-level security > +boundary between such users, but it is sometimes done anyway. > + > +In this case, when the second username is looked up in the userdb, it > +overwrites (replaces) the entry in the hash table that is indexed by > +uid, freeing the DBusUserInfo. This results in both the key and the > +value in the hash table that is indexed by username becoming dangling > +pointers (use-after-free), leading to undefined behaviour, which is > +certainly not what we want to see when doing access control. > + > +An equivalent situation can occur with groups, in the rare case where > +a numeric group ID has two names (although I have not heard of this > +being done in practice). > + > +Solve this by reference-counting the data structure. There are up to > +three references in practice: one held temporarily while the lookup > +function is populating and storing it, one held by the hash table that > +is indexed by uid, and one held by the hash table that is indexed by > +name. > + > +Closes: dbus#305 > +Signed-off-by: Simon McVittie > + > +Upsteam-Status: Backport > +https://gitlab.freedesktop.org/dbus/dbus/-/commit/e75c67a28fa2bc41a8ab0de433a52355c71a8abf > +CVE: CVE-2020-35512 > +Signed-off-by: Armin Kuster > + > +--- > + dbus/dbus-sysdeps-unix.h | 2 ++ > + dbus/dbus-userdb-util.c | 38 ++- > + dbus/dbus-userdb.c | 67 ++-- > + dbus/dbus-userdb.h | 6 ++-- > + 4 files changed, 86 insertions(+), 27 deletions(-) > + > +Index: dbus-1.12.16/dbus/dbus-sysdeps-unix.h > +=== > +--- dbus-1.12.16.orig/dbus/dbus-sysdeps-unix.h > dbus-1.12.16/dbus/dbus-sysdeps-unix.h > +@@ -105,6 +105,7 @@ typedef struct DBusGroupInfo DBusGroupIn > + */ > + struct DBusUserInfo > + { > ++ size_t refcount; /**< Reference count */ > + dbus_uid_t uid;/**< UID */ > + dbus_gid_t primary_gid;/**< GID */ > + dbus_gid_t *group_ids; /**< Groups IDs, *including* above primary > group */ > +@@ -118,6 +119,7 @@ struct DBusUserInfo > + */ > + struct DBusGroupInfo > + { > ++ size_t refcount; /**< Reference count */ > + dbus_gid_t gid;/**< GID */ > + char *groupname; /**< Group name */ > + }; > +Index: dbus-1.12.16/dbus/dbus-userdb-util.c > +=== > +--- dbus-1.12.16.orig/dbus/dbus-userdb-util.c > dbus-1.12.16/dbus/dbus-userdb-util.c > +@@ -38,6 +38,15 @@ > + * @{ > + */ > + > ++static DBusGroupInfo * > ++_dbus_group_info_ref (DBusGroupInfo *info) > ++{ > ++ _dbus_assert (info->refcount > 0); > ++ _dbus_assert (info->refcount < SIZE_MAX); > ++ info->refcount++; > ++ return info; > ++} > ++ > + /** > + * Checks to see if the UID sent in is the console user > + * > +@@ -240,9 +249,9 @@ _dbus_get_user_id_and_primary_group (con > + * @param gid the group ID or #DBUS_GID_UNSET > + * @param groupname group name or #NULL > + * @param error error to fill in > +- * @returns the entry in the database > ++ * @returns the entry in the database (borrowed, do not free) > + */ > +-DBusGroupInfo* > ++const DBusGroupInfo* > +
[OE-core] [PATCH 14/14] wpebackend-fdo: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-2-Clause. Signed-off-by: Ross Burton --- meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb index 4588ee10eaf..29ffb9091fe 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb @@ -2,7 +2,7 @@ SUMMARY = "WPE's backend based on a freedesktop.org stack." HOMEPAGE = "https://github.com/Igalia/WPEBackend-fdo; BUGTRACKER = "https://github.com/Igalia/WPEBackend-fdo/issues; -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155640): https://lists.openembedded.org/g/openembedded-core/message/155640 Mute This Topic: https://lists.openembedded.org/mt/85331686/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 13/14] libwpe: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-2-Clause. Signed-off-by: Ross Burton --- meta/recipes-sato/webkit/libwpe_1.10.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/libwpe_1.10.1.bb b/meta/recipes-sato/webkit/libwpe_1.10.1.bb index 6f2fe1df423..4e77481bc8f 100644 --- a/meta/recipes-sato/webkit/libwpe_1.10.1.bb +++ b/meta/recipes-sato/webkit/libwpe_1.10.1.bb @@ -2,7 +2,7 @@ SUMMARY = "General-purpose library specifically developed for the WPE-flavored p HOMEPAGE = "https://github.com/WebPlatformForEmbedded/libwpe; BUGTRACKER = "https://github.com/WebPlatformForEmbedded/libwpe/issues; -LICENSE = "BSD" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" DEPENDS = "virtual/egl libxkbcommon" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155639): https://lists.openembedded.org/g/openembedded-core/message/155639 Mute This Topic: https://lists.openembedded.org/mt/85331685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 10/14] iputils: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-3-Clause. Signed-off-by: Ross Burton --- meta/recipes-extended/iputils/iputils_20210722.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/iputils/iputils_20210722.bb b/meta/recipes-extended/iputils/iputils_20210722.bb index 2e8d9032e47..cafb0f634ec 100644 --- a/meta/recipes-extended/iputils/iputils_20210722.bb +++ b/meta/recipes-extended/iputils/iputils_20210722.bb @@ -4,7 +4,7 @@ tracepath, tracepath6, ping, ping6 and arping." HOMEPAGE = "https://github.com/iputils/iputils; SECTION = "console/network" -LICENSE = "BSD & GPLv2+" +LICENSE = "BSD-3-Clause & GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE;md5=55aa8c9fcad0691cef0ecd420361e390" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155636): https://lists.openembedded.org/g/openembedded-core/message/155636 Mute This Topic: https://lists.openembedded.org/mt/85331680/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 11/14] libx11-compose-data: set precise BSD license
"BSD" is ambiguous, use the precise licenses BSD-2-Clause BSD-4-Clause. Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb index 7519b4c018d..e53ccc6aea8 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb @@ -8,7 +8,7 @@ python () { require xorg-lib-common.inc -LICENSE = "MIT & MIT-style & BSD" +LICENSE = "MIT & MIT-style & BSD-4-Clause & BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" SRC_URI[md5sum] = "c5fa5a86a20e3591bed6c046498d4b8f" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155637): https://lists.openembedded.org/g/openembedded-core/message/155637 Mute This Topic: https://lists.openembedded.org/mt/85331681/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 12/14] webkitgtk: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-2-Clause. Signed-off-by: Ross Burton --- meta/recipes-sato/webkit/webkitgtk_2.32.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb index c30bdf3428d..1f3f7a9c00a 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.32.3.bb @@ -2,7 +2,7 @@ SUMMARY = "WebKit web rendering engine for the GTK+ platform" HOMEPAGE = "https://www.webkitgtk.org/; BUGTRACKER = "https://bugs.webkit.org/; -LICENSE = "BSD & LGPLv2+" +LICENSE = "BSD-2-Clause & LGPLv2+" LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d84286dda758da57bd691 \ file://Source/WebCore/LICENSE-APPLE;md5=4646f90082c40bcf298c285f8bab0b12 \ file://Source/WebCore/LICENSE-LGPL-2;md5=36357ffde2b64ae177b2494445b79d21 \ -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155638): https://lists.openembedded.org/g/openembedded-core/message/155638 Mute This Topic: https://lists.openembedded.org/mt/85331683/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 07/14] libevent: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-3-Clause. Signed-off-by: Ross Burton --- meta/recipes-support/libevent/libevent_2.1.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libevent/libevent_2.1.12.bb b/meta/recipes-support/libevent/libevent_2.1.12.bb index 2a562fe2e96..4b419eab226 100644 --- a/meta/recipes-support/libevent/libevent_2.1.12.bb +++ b/meta/recipes-support/libevent/libevent_2.1.12.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://libevent.org/; BUGTRACKER = "https://github.com/libevent/libevent/issues; SECTION = "libs" -LICENSE = "BSD & MIT" +LICENSE = "BSD-3-Clause & MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=17f20574c0b154d12236d5fbe964f549" SRC_URI = "https://github.com/libevent/libevent/releases/download/release-${PV}-stable/${BP}-stable.tar.gz \ -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155633): https://lists.openembedded.org/g/openembedded-core/message/155633 Mute This Topic: https://lists.openembedded.org/mt/85331677/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 09/14] python3-packaging: fix license statement
This is licensed as Apache OR BSD, not AND. Also use the precise license BSD-2-Clause. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-packaging_21.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-packaging_21.0.bb b/meta/recipes-devtools/python/python3-packaging_21.0.bb index eacc48e56af..201b583de22 100644 --- a/meta/recipes-devtools/python/python3-packaging_21.0.bb +++ b/meta/recipes-devtools/python/python3-packaging_21.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Core utilities for Python packages" HOMEPAGE = "https://github.com/pypa/packaging; -LICENSE = "Apache-2.0 & BSD" +LICENSE = "Apache-2.0 | BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=faadaedca9251a90b205c9167578ce91" SRC_URI[sha256sum] = "7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155635): https://lists.openembedded.org/g/openembedded-core/message/155635 Mute This Topic: https://lists.openembedded.org/mt/85331679/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 08/14] openssh: remove redundant BSD license
The license statement already includes BSD-2-Clause and BSD-3-Clause, so remove the redundant and ambiguous BSD license. Signed-off-by: Ross Burton --- meta/recipes-connectivity/openssh/openssh_8.7p1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb index c4a08f71d63..8a2e7611af8 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.7p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.7p1.bb @@ -5,7 +5,7 @@ Ssh (Secure Shell) is a program for logging into a remote machine \ and for executing commands on a remote machine." HOMEPAGE = "http://www.openssh.com/; SECTION = "console/network" -LICENSE = "BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & BSD & ISC & MIT" +LICENSE = "BSD-2-Clause & BSD-3-Clause & BSD-4-Clause & ISC & MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=d9d2753bdef9f19466dc7bc959114b11" DEPENDS = "zlib openssl virtual/crypt" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155634): https://lists.openembedded.org/g/openembedded-core/message/155634 Mute This Topic: https://lists.openembedded.org/mt/85331678/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 06/14] acpica: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-3-Clause. Signed-off-by: Ross Burton --- meta/recipes-extended/acpica/acpica_20210730.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/acpica/acpica_20210730.bb b/meta/recipes-extended/acpica/acpica_20210730.bb index 490e8124348..b66e605f8b2 100644 --- a/meta/recipes-extended/acpica/acpica_20210730.bb +++ b/meta/recipes-extended/acpica/acpica_20210730.bb @@ -9,7 +9,7 @@ ACPI tables." HOMEPAGE = "http://www.acpica.org/; SECTION = "console/tools" -LICENSE = "Intel | BSD | GPLv2" +LICENSE = "Intel | BSD-3-Clause | GPLv2" LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=c33ce358fdcd142684e41e336b7992e8" COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155632): https://lists.openembedded.org/g/openembedded-core/message/155632 Mute This Topic: https://lists.openembedded.org/mt/85331676/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 05/14] dtc: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-2-Clause. Signed-off-by: Ross Burton --- meta/recipes-kernel/dtc/dtc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc index 12508b235d9..bfdc9f86399 100644 --- a/meta/recipes-kernel/dtc/dtc.inc +++ b/meta/recipes-kernel/dtc/dtc.inc @@ -2,7 +2,7 @@ SUMMARY = "Device Tree Compiler" HOMEPAGE = "https://devicetree.org/; DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels." SECTION = "bootloader" -LICENSE = "GPLv2 | BSD" +LICENSE = "GPLv2 | BSD-2-Clause" DEPENDS = "flex-native bison-native" SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \ -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155631): https://lists.openembedded.org/g/openembedded-core/message/155631 Mute This Topic: https://lists.openembedded.org/mt/85331675/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 04/14] nfs-utils: set precise BSD license
"BSD" is ambiguous, use the precise license BSD-3-Clause. Signed-off-by: Ross Burton --- meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb index 495ce4e542c..a655de2aca7 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.5.4.bb @@ -4,7 +4,7 @@ NFS server and related tools." HOMEPAGE = "http://nfs.sourceforge.net/; SECTION = "console/network" -LICENSE = "MIT & GPLv2+ & BSD" +LICENSE = "MIT & GPLv2+ & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" # util-linux for libblkid -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155630): https://lists.openembedded.org/g/openembedded-core/message/155630 Mute This Topic: https://lists.openembedded.org/mt/85331674/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 02/14] python3-numpy: remove redundant BSD license
The license list already includes BSD-2-Clause and BSD-3-Clause, so remove the redundant and ambiguous BSD license. Signed-off-by: Ross Burton --- meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb index 2d4c62af811..8e09585712d 100644 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.2.bb @@ -2,7 +2,7 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" HOMEPAGE = "https://numpy.org/; DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python." SECTION = "devel/python" -LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" +LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b076ad374a7d311ba3126a22b2d52596" SRCNAME = "numpy" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155628): https://lists.openembedded.org/g/openembedded-core/message/155628 Mute This Topic: https://lists.openembedded.org/mt/85331671/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 03/14] quota: remove BSD license
Only the 'quot' tool was BSD licensed, and this was removed upstream in commit 5d30a29 (since 4.05). Signed-off-by: Ross Burton --- meta/recipes-extended/quota/quota_4.06.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/quota/quota_4.06.bb b/meta/recipes-extended/quota/quota_4.06.bb index 5115cb389ae..e32bdd4c32b 100644 --- a/meta/recipes-extended/quota/quota_4.06.bb +++ b/meta/recipes-extended/quota/quota_4.06.bb @@ -3,7 +3,7 @@ SECTION = "base" HOMEPAGE = "http://sourceforge.net/projects/linuxquota/; DESCRIPTION = "Tools and patches for the Linux Diskquota system as part of the Linux kernel" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136=118136; -LICENSE = "BSD & GPLv2+ & LGPLv2.1+" +LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \ file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155629): https://lists.openembedded.org/g/openembedded-core/message/155629 Mute This Topic: https://lists.openembedded.org/mt/85331672/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 01/14] lz4: remove redundant BSD license
The upstream license is BSD-2-Clause or GPLv2, so remove the redundant and ambiguous BSD license. Signed-off-by: Ross Burton --- meta/recipes-support/lz4/lz4_1.9.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/lz4/lz4_1.9.3.bb b/meta/recipes-support/lz4/lz4_1.9.3.bb index 74f6743b916..b22eea3156a 100644 --- a/meta/recipes-support/lz4/lz4_1.9.3.bb +++ b/meta/recipes-support/lz4/lz4_1.9.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Extremely Fast Compression algorithm" DESCRIPTION = "LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems." HOMEPAGE = "https://github.com/lz4/lz4; -LICENSE = "BSD | BSD-2-Clause | GPL-2.0" +LICENSE = "BSD-2-Clause | GPL-2.0" LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \ file://programs/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE;md5=d57c0d21cb917fb4e0af2454aa48b956 \ -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155627): https://lists.openembedded.org/g/openembedded-core/message/155627 Mute This Topic: https://lists.openembedded.org/mt/85331670/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] wic: Add extra-space argument
On Thu, Sep 02, 2021 at 03:19:21PM +0200, Kristian Klausen via lists.openembedded.org wrote: > This allows extra space to be added after the last partition and is > especially useful when free space is needed for ex: adding partitions on > first boot with ex: systemd-repart[1] and the image is tested in QEMU. > > [1] https://www.freedesktop.org/software/systemd/man/systemd-repart.html Well that's certainly interesting. > > Signed-off-by: Kristian Klausen > --- > scripts/lib/wic/plugins/imager/direct.py | 7 +-- > scripts/wic | 2 ++ > 2 files changed, 7 insertions(+), 2 deletions(-) Can you add a test case for this? That'd help also demonstrate how this would be used over just having a minimal wks file and repart.d conf files to describe the rest of the system. Thanks! -- Tom -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155626): https://lists.openembedded.org/g/openembedded-core/message/155626 Mute This Topic: https://lists.openembedded.org/mt/85327132/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] wic: Add extra-space argument
This allows extra space to be added after the last partition and is especially useful when free space is needed for ex: adding partitions on first boot with ex: systemd-repart[1] and the image is tested in QEMU. [1] https://www.freedesktop.org/software/systemd/man/systemd-repart.html Signed-off-by: Kristian Klausen --- scripts/lib/wic/plugins/imager/direct.py | 7 +-- scripts/wic | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 96168aadb4..9d10ec01d0 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -77,7 +77,8 @@ class DirectPlugin(ImagerPlugin): image_path = self._full_path(self.workdir, self.parts[0].disk, "direct") self._image = PartitionedImage(image_path, self.ptable_format, - self.parts, self.native_sysroot) + self.parts, self.native_sysroot, + options.extra_space) def setup_workdir(self, workdir): if workdir: @@ -293,7 +294,7 @@ class PartitionedImage(): Partitioned image in a file. """ -def __init__(self, path, ptable_format, partitions, native_sysroot=None): +def __init__(self, path, ptable_format, partitions, native_sysroot=None, extra_space=0): self.path = path # Path to the image file self.numpart = 0 # Number of allocated partitions self.realpart = 0 # Number of partitions in the partition table @@ -314,6 +315,7 @@ class PartitionedImage(): self.sector_size = SECTOR_SIZE self.native_sysroot = native_sysroot num_real_partitions = len([p for p in self.partitions if not p.no_table]) +self.extra_space = extra_space # calculate the real partition number, accounting for partitions not # in the partition table and logical partitions @@ -483,6 +485,7 @@ class PartitionedImage(): self.min_size += GPT_OVERHEAD self.min_size *= self.sector_size +self.min_size += self.extra_space def _create_partition(self, device, parttype, fstype, start, size): """ Create a partition on an image described by the 'device' object. """ diff --git a/scripts/wic b/scripts/wic index a741aed364..57197c2048 100755 --- a/scripts/wic +++ b/scripts/wic @@ -346,6 +346,8 @@ def wic_init_parser_create(subparser): default=False, help="output debug information") subparser.add_argument("-i", "--imager", dest="imager", default="direct", help="the wic imager plugin") +subparser.add_argument("--extra-space", type=int, dest="extra_space", + default=0, help="additional free disk space to add to the image") return -- 2.33.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155625): https://lists.openembedded.org/g/openembedded-core/message/155625 Mute This Topic: https://lists.openembedded.org/mt/85327132/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [RFC PATCH] common-licenses: add missing SPDX licences
You're right, the script isn't filtering out deprecated licenses. V2 posted. Ross On Wed, 1 Sept 2021 at 22:35, Richard Purdie wrote: > > On Wed, 2021-09-01 at 21:09 +0100, Ross Burton wrote: > > As part of the work to converge our license support with SPDX, ensure > > that we have all of the licenses that SPDX supports. > > > > Signed-off-by: Ross Burton > > --- > > meta/files/common-licenses/0BSD | 5 + > > meta/files/common-licenses/ADSL | 1 + > > meta/files/common-licenses/AFL-1.1| 27 + > > meta/files/common-licenses/AGPL-1.0 | 86 +++ > > meta/files/common-licenses/AGPL-1.0-only | 86 +++ > > meta/files/common-licenses/AGPL-1.0-or-later | 86 +++ > > meta/files/common-licenses/AGPL-3.0 | 235 > > meta/files/common-licenses/AMDPLPA| 20 + > > meta/files/common-licenses/AML| 9 + > > meta/files/common-licenses/AMPAS | 13 + > > meta/files/common-licenses/ANTLR-PD-fallback | 7 + > > meta/files/common-licenses/APAFML | 3 + > > meta/files/common-licenses/Abstyles | 11 + > > meta/files/common-licenses/Adobe-2006 | 12 + > > meta/files/common-licenses/Adobe-Glyph| 10 + > > meta/files/common-licenses/Afmparse | 10 + > > meta/files/common-licenses/Aladdin| 62 ++ > > meta/files/common-licenses/Artistic-1.0-Perl | 51 ++ > > meta/files/common-licenses/Artistic-1.0-cl8 | 51 ++ > > .../common-licenses/BSD-2-Clause-FreeBSD | 13 + > > .../files/common-licenses/BSD-2-Clause-NetBSD | 11 + > > meta/files/common-licenses/BSD-2-Clause-Views | 11 + > > .../common-licenses/BSD-3-Clause-Attribution | 11 + > > meta/files/common-licenses/BSD-3-Clause-LBNL | 12 + > > .../common-licenses/BSD-3-Clause-Modification | 35 ++ > > .../BSD-3-Clause-No-Military-License | 16 + > > .../BSD-3-Clause-No-Nuclear-License | 14 + > > .../BSD-3-Clause-No-Nuclear-License-2014 | 16 + > > .../BSD-3-Clause-No-Nuclear-Warranty | 14 + > > .../common-licenses/BSD-3-Clause-Open-MPI | 34 ++ > > .../common-licenses/BSD-4-Clause-Shortened| 13 + > > meta/files/common-licenses/BSD-4-Clause-UC| 15 + > > meta/files/common-licenses/BSD-Protection | 53 ++ > > meta/files/common-licenses/BSD-Source-Code| 10 + > > meta/files/common-licenses/BUSL-1.1 | 72 +++ > > meta/files/common-licenses/Bahyph | 11 + > > meta/files/common-licenses/Barr | 1 + > > meta/files/common-licenses/Beerware | 1 + > > meta/files/common-licenses/BitTorrent-1.0 | 330 +++ > > meta/files/common-licenses/BitTorrent-1.1 | 137 + > > meta/files/common-licenses/BlueOak-1.0.0 | 55 ++ > > meta/files/common-licenses/Borceux| 19 + > > meta/files/common-licenses/C-UDA-1.0 | 47 ++ > > meta/files/common-licenses/CAL-1.0| 354 +++ > > .../CAL-1.0-Combined-Work-Exception | 354 +++ > > meta/files/common-licenses/CC-BY-2.5-AU | 112 > > meta/files/common-licenses/CC-BY-3.0-AT | 111 > > meta/files/common-licenses/CC-BY-3.0-DE | 109 > > meta/files/common-licenses/CC-BY-3.0-NL | 97 +++ > > meta/files/common-licenses/CC-BY-3.0-US | 83 +++ > > meta/files/common-licenses/CC-BY-4.0 | 156 + > > meta/files/common-licenses/CC-BY-NC-3.0-DE| 110 > > meta/files/common-licenses/CC-BY-NC-4.0 | 158 + > > meta/files/common-licenses/CC-BY-NC-ND-3.0-DE | 101 > > .../files/common-licenses/CC-BY-NC-ND-3.0-IGO | 99 > > meta/files/common-licenses/CC-BY-NC-ND-4.0| 155 + > > meta/files/common-licenses/CC-BY-NC-SA-2.0-FR | 93 +++ > > meta/files/common-licenses/CC-BY-NC-SA-2.0-UK | 149 + > > meta/files/common-licenses/CC-BY-NC-SA-3.0-DE | 126 > > .../files/common-licenses/CC-BY-NC-SA-3.0-IGO | 105 > > meta/files/common-licenses/CC-BY-NC-SA-4.0| 170 ++ > > meta/files/common-licenses/CC-BY-ND-3.0-DE| 101 > > meta/files/common-licenses/CC-BY-ND-4.0 | 154 + > > meta/files/common-licenses/CC-BY-SA-2.0-UK| 147 + > > meta/files/common-licenses/CC-BY-SA-2.1-JP| 83 +++ > > meta/files/common-licenses/CC-BY-SA-3.0-AT| 139 + > > meta/files/common-licenses/CC-BY-SA-3.0-DE| 136 + > > meta/files/common-licenses/CC-PDDC| 8 + > > meta/files/common-licenses/CDDL-1.1 | 123 > > meta/files/common-licenses/CDL-1.0| 53 ++ > > .../files/common-licenses/CDLA-Permissive-1.0 | 85 +++ > > .../files/common-licenses/CDLA-Permissive-2.0 | 35 ++ > > meta/files/common-licenses/CDLA-Sharing-1.0 | 89 +++ > > meta/files/common-licenses/CECILL-1.1 | 229 +++ > > meta/files/common-licenses/CECILL-2.1 | 518 > > meta/files/common-licenses/CERN-OHL-1.1
[OE-core] [PATCH] glslang: upgrade 11.5.0 -> 11.6.0
## 11.6.0 2021-08-25 ### Other changes * Atomic memory function only for shader storage block member or shared variable * Add support for gl_MaxVaryingVectors for ogl * Fix loading bool arrays from interface blocks * Generate separate stores for partially swizzled memory stores * Allow layout(std430) uniform with GL_EXT_scalar_block_layout * Support for pragma STDGL invariant(all) * Support for GL_NV_ray_tracing_motion_blur Signed-off-by: Wang Mingyu --- .../glslang/{glslang_11.5.0.bb => glslang_11.6.0.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/glslang/{glslang_11.5.0.bb => glslang_11.6.0.bb} (95%) diff --git a/meta/recipes-graphics/glslang/glslang_11.5.0.bb b/meta/recipes-graphics/glslang/glslang_11.6.0.bb similarity index 95% rename from meta/recipes-graphics/glslang/glslang_11.5.0.bb rename to meta/recipes-graphics/glslang/glslang_11.6.0.bb index 2f076e5684..c39be55d5f 100644 --- a/meta/recipes-graphics/glslang/glslang_11.5.0.bb +++ b/meta/recipes-graphics/glslang/glslang_11.6.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler; LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" -SRCREV = "ae2a562936cc8504c9ef2757cceaff163147834f" +SRCREV = "2fb89a0072ae7316af1c856f22663fde4928128a" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \ file://0001-generate-glslang-pkg-config.patch" UPSTREAM_CHECK_GITTAGREGEX = "^(?P\d+(\.\d+)+)$" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155622): https://lists.openembedded.org/g/openembedded-core/message/155622 Mute This Topic: https://lists.openembedded.org/mt/85323345/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] cmake: upgrade 3.21.1 -> 3.21.2
Signed-off-by: Wang Mingyu --- .../cmake/{cmake-native_3.21.1.bb => cmake-native_3.21.2.bb}| 0 meta/recipes-devtools/cmake/cmake.inc | 2 +- .../recipes-devtools/cmake/{cmake_3.21.1.bb => cmake_3.21.2.bb} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/cmake/{cmake-native_3.21.1.bb => cmake-native_3.21.2.bb} (100%) rename meta/recipes-devtools/cmake/{cmake_3.21.1.bb => cmake_3.21.2.bb} (100%) diff --git a/meta/recipes-devtools/cmake/cmake-native_3.21.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.21.2.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake-native_3.21.1.bb rename to meta/recipes-devtools/cmake/cmake-native_3.21.2.bb diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 7f0aff8118..2bdfd6061a 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -21,7 +21,7 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://0004-Fail-silently-if-system-Qt-installation-is-broken.patch \ " -SRC_URI[sha256sum] = "fac3915171d4dff25913975d712f76e69aef44bf738ba7b976793a458b4cfed4" +SRC_URI[sha256sum] = "94275e0b61c84bb42710f5320a23c6dcb2c6ee032ae7d2a616f53f68b3d21659" UPSTREAM_CHECK_REGEX = "cmake-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/cmake/cmake_3.21.1.bb b/meta/recipes-devtools/cmake/cmake_3.21.2.bb similarity index 100% rename from meta/recipes-devtools/cmake/cmake_3.21.1.bb rename to meta/recipes-devtools/cmake/cmake_3.21.2.bb -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155621): https://lists.openembedded.org/g/openembedded-core/message/155621 Mute This Topic: https://lists.openembedded.org/mt/85323089/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] mesa: enable crocus driver for older intel graphics
From: Alexander Kanavin See here for the full story: https://www.phoronix.com/scan.php?page=news_item=Intel-Crocus-Default-Gallium3D Once crocus does become the default over i965, upstream is likely to retire classic pre-gallium drivers altogether, which (with the exception of i965, superseded by crocus) are all for retrocomputing hardware. Signed-off-by: Alexander Kanavin --- meta/recipes-graphics/mesa/mesa.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 2fb823dfb8..e8f46384ff 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -131,9 +131,8 @@ PACKAGECONFIG[v3d] = "" GALLIUMDRIVERS = "swrast" # gallium swrast was found to crash Xorg on startup in x32 qemu GALLIUMDRIVERS:x86-x32 = "" -# Add crocus when 21.2 is out to the list below to support the full range of Intel GPUs -GALLIUMDRIVERS:append:x86:class-target = ",i915,iris" -GALLIUMDRIVERS:append:x86-64:class-target = ",i915,iris" +GALLIUMDRIVERS:append:x86:class-target = ",i915,iris,crocus" +GALLIUMDRIVERS:append:x86-64:class-target = ",i915,iris,crocus" GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155620): https://lists.openembedded.org/g/openembedded-core/message/155620 Mute This Topic: https://lists.openembedded.org/mt/85323025/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [dunfell][PATCH] Revert "sdk: fix relocate symlink failed"
On Thu, Sep 2, 2021 at 12:33 AM Steve Sakoman wrote: > > On Wed, Sep 1, 2021 at 9:33 AM grygorii tertychnyi > wrote: > > > > This reverts commit a155c4d4ca841ef492213a5f0b9121703c62e2b4. > > > > Otherwise, SDK installing fails with: > > > > Extracting > > SDK...done > > Setting it up...sed: -e expression #1, char 0: no previous regular > > expression > > sed: -e expression #1, char 0: no previous regular expression > > ... tonns of lines ... > > sed: -e expression #1, char 0: no previous regular expression > > done > > SDK has been successfully set up and is ready to be used. > > I can confirm the above noise from sed in dunfell, though the SDK does > seem to be set up successfully as the above message indicates. I have > verified that I can use the resulting sdk to build a test app. Actually, in my case all symlinks are wrong. I installed the SDK in a non-default path with "-y -d " but all symlinks point to default path: » l ./sysroots/x86_64-leicasdk-linux/bin/zcat lrwxrwxrwx 1 gr grygorii 61 2021-09-02 08:37 ./sysroots/x86_64-leicasdk-linux/bin/zcat -> /opt/geosurv/3.1/sysroots/x86_64-leicasdk-linux/bin/zcat.gzip instead of » l ./sysroots/x86_64-leicasdk-linux/bin/zcat lrwxrwxrwx 1 gr grygorii 67 2021-09-02 08:26 ./sysroots/x86_64-leicasdk-linux/bin/zcat -> /geo/wok/1/sdk-try/sdk/sysroots/x86_64-leicasdk-linux/bin/zcat.gzip So, it breaks our workflow now. > Also I can confirm that > https://bugzilla.yoctoproject.org/show_bug.cgi?id=1 is fixed with > "sdk: fix relocate symlink failed" (in both master and dunfell) Are you sure it is "sdk: fix relocate symlink failed" https://git.openembedded.org/openembedded-core/commit/?id=a155c4d4ca841ef492213a5f0b9121703c62e2b4? It does not look related to this bug. > > Original commit message mentions commit bc4ee54535 ("sdk: Decouple > > default install path from built in path"), that is not part of > > dunfell. Hence, revert this fix. > > Adding "sdk: Decouple default install path from built in path" to > dunfell eliminates the sed noise you were encountering. > > So I think we want both "sdk: fix relocate symlink failed" and "sdk: > Decouple default install path from built in path" in dufell. I confirm that adding "sdk: Decouple default install path from built in path" to dunfell fixes "sed" issues. So, most probably instead of reverting "sdk: fix relocate symlink failed" we need to add "sdk: Decouple default install path from built in path" to dunfell. And handknott : ) > Thoughts Richard? I know you were worrying about this. > > Steve > > > > Signed-off-by: grygorii tertychnyi > > --- > > meta/files/toolchain-shar-relocate.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/files/toolchain-shar-relocate.sh > > b/meta/files/toolchain-shar-relocate.sh > > index ba873373e29e..54337412966c 100644 > > --- a/meta/files/toolchain-shar-relocate.sh > > +++ b/meta/files/toolchain-shar-relocate.sh > > @@ -72,7 +72,7 @@ fi > > > > # change all symlinks pointing to @SDKPATH@ > > for l in $($SUDO_EXEC find $native_sysroot -type l); do > > - $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e > > "s:$SDK_BUILD_PATH:$target_sdk_dir:") $l > > + $SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e > > "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l > > if [ $? -ne 0 ]; then > > echo "Failed to setup symlinks. Relocate script failed. > > Abort!" > > exit 1 > > -- > > 2.30.2 > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155619): https://lists.openembedded.org/g/openembedded-core/message/155619 Mute This Topic: https://lists.openembedded.org/mt/85311771/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core][PATCH 19/31] tzdata: Remove BSD License specifier
On Wed, 2021-09-01 at 19:00 -0400, Denys Dmytriyenko wrote: > Can license cleanups in patches 19-31 be submitted as a separate patchset, > independent from SBoM changes? I already queued them the other way around in master-next and will be considering them as two different patchsets. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155618): https://lists.openembedded.org/g/openembedded-core/message/155618 Mute This Topic: https://lists.openembedded.org/mt/85302514/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] rust: remove unused patches
* 0001-nfc-Fix-missing-include.patch was only used in 1.51.0 version recently removed * 0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch was only used in 1.49.0 version in meta-rust Signed-off-by: Martin Jansa --- .../0001-nfc-Fix-missing-include.patch| 26 --- ...-dash-vs-underscore-mismatches-in-op.patch | 75 --- 2 files changed, 101 deletions(-) delete mode 100644 meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch delete mode 100644 meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch diff --git a/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch b/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch deleted file mode 100644 index f6dee77ab2..00 --- a/meta/recipes-devtools/rust/rust-llvm/0001-nfc-Fix-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3b7e611bd58ba842470d17374c550e14bceca5c7 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Tue, 10 Nov 2020 14:55:25 +0100 -Subject: [PATCH] [nfc] Fix missing include - -Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/b498303066a63a203d24f739b2d2e0e56dca70d1] -Signed-off-by: Khem Raj - llvm/utils/benchmark/src/benchmark_register.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h -index 0705e219f2fa..4caa5ad4da07 100644 a/llvm/utils/benchmark/src/benchmark_register.h -+++ b/llvm/utils/benchmark/src/benchmark_register.h -@@ -1,6 +1,7 @@ - #ifndef BENCHMARK_REGISTER_H - #define BENCHMARK_REGISTER_H - -+#include - #include - - #include "check.h" --- -2.30.1 - diff --git a/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch b/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch deleted file mode 100644 index 13d81eaa37..00 --- a/meta/recipes-devtools/rust/rust/0001-rustc_target-Fix-dash-vs-underscore-mismatches-in-op.patch +++ /dev/null @@ -1,75 +0,0 @@ -From dd682cb48c8b667859dded98a4bbfbd891a1eca4 Mon Sep 17 00:00:00 2001 -From: Vadim Petrochenkov -Date: Thu, 12 Nov 2020 19:16:59 +0300 -Subject: [PATCH] rustc_target: Fix dash vs underscore mismatches in option - names - - compiler/rustc_target/src/spec/mod.rs | 16 - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index f949bf95a50..f837114ee74 100644 a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -1428,8 +1428,8 @@ pub fn from_json(obj: Json) -> Result { - } - - key!(is_builtin, bool); --key!(endian = "target_endian"); --key!(c_int_width = "target_c_int_width"); -+key!(endian = "target-endian"); -+key!(c_int_width = "target-c-int-width"); - key!(os); - key!(env); - key!(vendor); -@@ -1466,7 +1466,7 @@ pub fn from_json(obj: Json) -> Result { - key!(exe_suffix); - key!(staticlib_prefix); - key!(staticlib_suffix); --key!(os_family = "target_family", optional); -+key!(os_family = "target-family", optional); - key!(abi_return_struct_as_int, bool); - key!(is_like_osx, bool); - key!(is_like_solaris, bool); -@@ -1511,7 +1511,7 @@ pub fn from_json(obj: Json) -> Result { - key!(limit_rdylib_exports, bool); - key!(override_export_symbols, opt_list); - key!(merge_functions, MergeFunctions)?; --key!(mcount = "target_mcount"); -+key!(mcount = "target-mcount"); - key!(llvm_abiname); - key!(relax_elf_relocations, bool); - key!(llvm_args, list); -@@ -1663,8 +1663,8 @@ fn to_json() -> Json { - target_val!(data_layout); - - target_option_val!(is_builtin); --target_option_val!(endian, "target_endian"); --target_option_val!(c_int_width, "target_c_int_width"); -+target_option_val!(endian, "target-endian"); -+target_option_val!(c_int_width, "target-c-int-width"); - target_option_val!(os); - target_option_val!(env); - target_option_val!(vendor); -@@ -1701,7 +1701,7 @@ fn to_json() -> Json { - target_option_val!(exe_suffix); - target_option_val!(staticlib_prefix); - target_option_val!(staticlib_suffix); --target_option_val!(os_family, "target_family"); -+target_option_val!(os_family, "target-family"); - target_option_val!(abi_return_struct_as_int); - target_option_val!(is_like_osx); - target_option_val!(is_like_solaris); -@@ -1746,7 +1746,7 @@ fn to_json() -> Json { - target_option_val!(limit_rdylib_exports); - target_option_val!(override_export_symbols); - target_option_val!(merge_functions); --
Re: [OE-core] [meta-oe][PATCH 2/2] mirrors.bbclass: remove redundant server-specific mirrors
Sorry for the incorrect prefix, the patches are meant for OE-core and NOT meta- oe. -- Daniel Wagenknecht emlix - smart embedded open source On Thu, 2021-09-02 at 08:31 +0200, Daniel Wagenknecht wrote: > With the previously added general git repo fallback rule the server > specific fallback mirrors for git.savannah.gnu.org and > git.yoctoproject.org are redundant. Remove them. > > Signed-off-by: Daniel Wagenknecht > --- > meta/classes/mirrors.bbclass | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass > index ab75ca1bb6..ba325a658b 100644 > --- a/meta/classes/mirrors.bbclass > +++ b/meta/classes/mirrors.bbclass > @@ -70,8 +70,6 @@ ${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \ > MIRRORS += "\ > git://salsa.debian.org/.* git://salsa.debian.org/PATH;protocol=https \n \ > git://git.gnome.org/.* > git://gitlab.gnome.org/GNOME/PATH;protocol=https \n \ > -git://git.savannah.gnu.org/.* > git://git.savannah.gnu.org/git/PATH;protocol=https \n \ > -git://git.yoctoproject.org/.* > git://git.yoctoproject.org/git/PATH;protocol=https \n \ > git://.*/.* git://HOST/PATH;protocol=https \n \ > git://.*/.* git://HOST/git/PATH;protocol=https \n \ > " > > signature.asc Description: This is a digitally signed message part -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155616): https://lists.openembedded.org/g/openembedded-core/message/155616 Mute This Topic: https://lists.openembedded.org/mt/85322332/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [meta-oe][PATCH 2/2] mirrors.bbclass: remove redundant server-specific mirrors
With the previously added general git repo fallback rule the server specific fallback mirrors for git.savannah.gnu.org and git.yoctoproject.org are redundant. Remove them. Signed-off-by: Daniel Wagenknecht --- meta/classes/mirrors.bbclass | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass index ab75ca1bb6..ba325a658b 100644 --- a/meta/classes/mirrors.bbclass +++ b/meta/classes/mirrors.bbclass @@ -70,8 +70,6 @@ ${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \ MIRRORS += "\ git://salsa.debian.org/.* git://salsa.debian.org/PATH;protocol=https \n \ git://git.gnome.org/.*git://gitlab.gnome.org/GNOME/PATH;protocol=https \n \ -git://git.savannah.gnu.org/.* git://git.savannah.gnu.org/git/PATH;protocol=https \n \ -git://git.yoctoproject.org/.* git://git.yoctoproject.org/git/PATH;protocol=https \n \ git://.*/.* git://HOST/PATH;protocol=https \n \ git://.*/.* git://HOST/git/PATH;protocol=https \n \ " -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155615): https://lists.openembedded.org/g/openembedded-core/message/155615 Mute This Topic: https://lists.openembedded.org/mt/85322272/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [meta-oe][PATCH 1/2] mirrors.bbclass: provide additional rule for git repo fallbacks
Git hosting servers that require a slightly different URL when accessing repositories via https protocol instead of the git native protocol are not uncommon (servers using cgit as web UI). Provide a general rule to try HOST/git/PATH via https as git repo fallback. Signed-off-by: Daniel Wagenknecht --- meta/classes/mirrors.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass index 87bba41472..ab75ca1bb6 100644 --- a/meta/classes/mirrors.bbclass +++ b/meta/classes/mirrors.bbclass @@ -73,4 +73,5 @@ git://git.gnome.org/.* git://gitlab.gnome.org/GNOME/PATH;protocol=https \ git://git.savannah.gnu.org/.* git://git.savannah.gnu.org/git/PATH;protocol=https \n \ git://git.yoctoproject.org/.* git://git.yoctoproject.org/git/PATH;protocol=https \n \ git://.*/.* git://HOST/PATH;protocol=https \n \ +git://.*/.* git://HOST/git/PATH;protocol=https \n \ " -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155614): https://lists.openembedded.org/g/openembedded-core/message/155614 Mute This Topic: https://lists.openembedded.org/mt/85322268/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-