From 772ceff2f3b6d737a9230e179d413e9ffb7a9c4c Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sun, 26 Sep 2021 13:10:50 -0700 Subject: README: updated Maintainers list for Honister Signed-off-by: Armin Kuster --- README | 2 +- meta-filesystems/README | 10 +++---- meta-gnome/README | 10 +++---- meta-initramfs/README | 8 ++--- meta-multimedia/README | 10 +++---- .../0001-wireshark-update-to-3.4.7.patch | 34 ++++++++++++++++++++++ meta-networking/MAINTAINERS | 32 ++------------------ meta-networking/README | 6 ++-- meta-oe/0001-cmocka-add-recipe.patch | 34 ++++++++++++++++++++++ meta-oe/README | 6 ++-- meta-perl/README | 10 +++---- meta-python/README | 13 ++++----- meta-webserver/README | 8 ++--- meta-xfce/README | 10 +++---- 14 files changed, 115 insertions(+), 78 deletions(-) create mode 100644 meta-networking/0001-wireshark-update-to-3.4.7.patch create mode 100644 meta-oe/0001-cmocka-add-recipe.patch diff --git a/README b/README index 7318f09cdb..8890417fa9 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ Collection of layers for the OE-core universe -Main layer maintainer: Khem Raj +Stable Branch maintainer: Armin Kuster This repository is a collection of layers to suppliment OE-Core with additional packages, Each layer have designated maintainer diff --git a/meta-filesystems/README b/meta-filesystems/README index 78a4429ce2..ef05791d0f 100644 --- a/meta-filesystems/README +++ b/meta-filesystems/README @@ -11,26 +11,26 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: honister URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: honister Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems]' in the subject. +with '[meta-filesystems][honister]' in the subject. -Layer maintainer: Khem Raj +Stable Branch maintainer: Armin kuster When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-filesystems][PATCH' + --subject-prefix='meta-filesystems][honister][PATCH' Table of Contents diff --git a/meta-gnome/README b/meta-gnome/README index 1a91050004..5725cde0ee 100644 --- a/meta-gnome/README +++ b/meta-gnome/README @@ -3,16 +3,16 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: honister revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: master +branch: honister revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][honister]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][honister][PATCH' -Layer maintainer: Andreas Müller +Stable Branch maintainer: Armin Kuster diff --git a/meta-initramfs/README b/meta-initramfs/README index a8f17ba859..e689cc4716 100644 --- a/meta-initramfs/README +++ b/meta-initramfs/README @@ -12,7 +12,7 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: honister revision: HEAD @@ -20,12 +20,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-initramfs]' in the subject. +with '[meta-initramfs][honister]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][honister][PATCH' -Interm layer maintainer: Khem Raj +Stable Branch maintainer: Armin Kuster License diff --git a/meta-multimedia/README b/meta-multimedia/README index 9c649ff87c..7865869b6d 100644 --- a/meta-multimedia/README +++ b/meta-multimedia/README @@ -1,19 +1,19 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: honister revision: HEAD URI: git://github.com/openembedded/meta-oe.git layers: meta-oe -branch: master +branch: honister revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][honister]' in the subject When sending single patches, please use something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][honister][PATCH' You are encouraged to fork the mirror on github https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like GitLab, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Layer maintainer: Andreas Müller +Stable Branch maintainer: Armin Kuster diff --git a/meta-networking/0001-wireshark-update-to-3.4.7.patch b/meta-networking/0001-wireshark-update-to-3.4.7.patch new file mode 100644 index 0000000000..1ee031c0da --- /dev/null +++ b/meta-networking/0001-wireshark-update-to-3.4.7.patch @@ -0,0 +1,34 @@ +From ef35f4ed2e1be5575c55fc752336206b8cc1ae55 Mon Sep 17 00:00:00 2001 +From: Armin Kuster +Date: Sun, 25 Jul 2021 10:16:13 -0700 +Subject: [meta-networking][PATCH] wireshark: update to 3.4.7 +To: openembedded-devel@lists.openembedded.org + +Stable branch bug fix update. Includes: +CVE-2021-22235 + +Signed-off-by: Armin Kuster +--- + .../wireshark/{wireshark_3.4.6.bb => wireshark_3.4.7.bb} | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + rename meta-networking/recipes-support/wireshark/{wireshark_3.4.6.bb => wireshark_3.4.7.bb} (97%) + +diff --git a/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb b/meta-networking/recipes-support/wireshark/wireshark_3.4.7.bb +similarity index 97% +rename from meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb +rename to meta-networking/recipes-support/wireshark/wireshark_3.4.7.bb +index 3062633bc3..7bc5a8150c 100644 +--- a/meta-networking/recipes-support/wireshark/wireshark_3.4.6.bb ++++ b/meta-networking/recipes-support/wireshark/wireshark_3.4.7.bb +@@ -19,7 +19,7 @@ SRC_URI += " \ + + UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" + +-SRC_URI[sha256sum] = "12a678208f8cb009e6b9d96026e41a6ef03c7ad086b9e1029f42053b249b4628" ++SRC_URI[sha256sum] = "6c4cee51ef997cb9d9aaee84113525a5629157d3c743d7c4e320000de804a09d" + + PE = "1" + +-- +2.25.1 + diff --git a/meta-networking/MAINTAINERS b/meta-networking/MAINTAINERS index 77e90668c4..6e98ede2ad 100644 --- a/meta-networking/MAINTAINERS +++ b/meta-networking/MAINTAINERS @@ -2,38 +2,12 @@ This file contains a list of maintainers for the meta-networking layer. Please submit any patches against meta-networking to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with -'[meta-networking]' in the subject. +'[meta-networking][honister]' in the subject. When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-networking][PATCH' + --subject-prefix='meta-networking][honister][PATCH' -You may also contact the maintainers directly. - -Descriptions of section entries: - - M: Mail patches to: FullName - F: Files and directories with wildcard patterns. - A trailing slash includes all files and subdirectory files. - F: recipes-devtools/ all files in and below recipes-devtools - F: recipes-selinux/* all files in recipes-selinux, but not below - One pattern per line. Multiple F: lines acceptable. - -Please keep this list in alphabetical order. - -Maintainers List (try to look for most precise areas first) - -COMMON -M: Khem Raj -M: "Joe MacDonald (backup)" -L: openembedded-devel@lists.openembedded.org -Q: https://patchwork.openembedded.org/project/oe/ -S: Maintained -F: conf -F: recipes-* - -NETKIT -M: Armin Kuster -F: recipes-netkit +Stable Branch Maintier: Armin Kuster diff --git a/meta-networking/README b/meta-networking/README index e1ba27d83b..78beb0144f 100644 --- a/meta-networking/README +++ b/meta-networking/README @@ -18,19 +18,19 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: honister revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-openembedded.git subdirectory: meta-oe -branch: master +branch: honister revision: HEAD URI: git://github.com/openembedded/meta-openembedded.git subdirectory: meta-python -branch: master +branch: honister revision: HEAD Maintenance diff --git a/meta-oe/0001-cmocka-add-recipe.patch b/meta-oe/0001-cmocka-add-recipe.patch new file mode 100644 index 0000000000..c772ab411d --- /dev/null +++ b/meta-oe/0001-cmocka-add-recipe.patch @@ -0,0 +1,34 @@ +From f708fe6948977ee2cebc092085774d33eacf23fd Mon Sep 17 00:00:00 2001 +From: Armin Kuster +Date: Thu, 24 Sep 2020 13:54:44 -0700 +Subject: [PATCH] cmocka: add recipe + +Signed-off-by: Armin Kuster +--- + meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb + +diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +new file mode 100644 +index 0000000000..a2d84025f1 +--- /dev/null ++++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.5.bb +@@ -0,0 +1,14 @@ ++DESCRIPTION = "cmocka is an elegant unit testing framework for C with support for mock \ ++objects. It only requires the standard C library, works on a range of computing \ ++platforms (including embedded) and with different compilers." ++HOMEPAGE = "https://cmocka.org/" ++ ++LICENSE = "Apache-2.0" ++LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" ++ ++SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git" ++SRCREV = "56eb3a183fc222120f86d0c54fd033992c30135e" ++ ++S = "${WORKDIR}/git" ++ ++inherit cmake ptest +-- +2.17.1 + diff --git a/meta-oe/README b/meta-oe/README index 98f671d7c2..4f8b55fd29 100644 --- a/meta-oe/README +++ b/meta-oe/README @@ -4,7 +4,7 @@ meta-oe This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: honister revision: HEAD luajit recipe requires host compiler to be able to generate 32bit code when target is 32bit @@ -20,7 +20,7 @@ sudo apt-get install gcc-multilib Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][PATCH"' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][honister][PATCH"' You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. @@ -29,4 +29,4 @@ Other services like GitLab, repo.or.cz or self-hosted setups are of course accep 'git fetch ' works the same on all of them. We recommend GitHub because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -layer maintainer: Khem Raj +Stable Branch maintainer: Armin Kuster diff --git a/meta-perl/README b/meta-perl/README index c519dff524..c47bea3d1d 100644 --- a/meta-perl/README +++ b/meta-perl/README @@ -52,7 +52,7 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core - branch: master + branch: honister revision: HEAD prio: default @@ -75,14 +75,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org with -'[meta-perl]' in the subject. +'[meta-perl][honister]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][honister][PATCH' -Layer maintainers: - Hongxu Jia - Tim "moto-timo" Orling +Stable Branch maintainer: Armin kuster License ------- diff --git a/meta-python/README b/meta-python/README index df6abe0e2e..2bab71d61a 100644 --- a/meta-python/README +++ b/meta-python/README @@ -13,12 +13,12 @@ The meta-python layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: honister revision: HEAD URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: honister revision: HEAD Please follow the recommended setup procedures of your OE distribution. @@ -35,15 +35,12 @@ comments and patch review. It is subscriber only, so please register before posting. Send pull requests to openembedded-devel@lists.openembedded.org with -'[meta-python]' in the subject. +'[meta-python][honister]' in the subject. When sending single patches, please use something like: -git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][PATCH' +git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][honister][PATCH' Maintenance ------------------------- -Layer Maintainers: - Tim "moto-timo" Orling - Derek Straka - Trevor Gamblin +Stable Branch Maintainer: Armin Kuster diff --git a/meta-webserver/README b/meta-webserver/README index 7b60630700..3d730d834e 100644 --- a/meta-webserver/README +++ b/meta-webserver/README @@ -13,14 +13,14 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git subdirectory: meta -branch: master +branch: honister revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-oe.git subdirectory: meta-oe -branch: master +branch: honister revision: HEAD @@ -52,9 +52,9 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-webserver]' in the subject. +with '[meta-webserver][honister]' in the subject. -Layer maintainer: Derek Straka +Stable Branch maintainer: Armin Kuster License diff --git a/meta-xfce/README b/meta-xfce/README index bbf4b2edf2..302e3243a3 100644 --- a/meta-xfce/README +++ b/meta-xfce/README @@ -1,11 +1,11 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: master +branch: honister revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: master +branch: honister revision: HEAD meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -14,9 +14,9 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][honister]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][honister][PATCH' -Layer maintainer: Kai Kang +Stable Branch maintainer: Armin Kuster -- cgit 1.2.3-korg