diff options
Diffstat (limited to 'meta/recipes-core/meta')
7 files changed, 74 insertions, 9 deletions
diff --git a/meta/recipes-core/meta/buildtools-extended-tarball.bb b/meta/recipes-core/meta/buildtools-extended-tarball.bb new file mode 100644 index 0000000000..94ed57585b --- /dev/null +++ b/meta/recipes-core/meta/buildtools-extended-tarball.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | require recipes-core/meta/buildtools-tarball.bb | ||
2 | |||
3 | DESCRIPTION = "SDK type target for building a standalone tarball containing build-essentials, python3, chrpath, \ | ||
4 | make, git and tar. The tarball can be used to run bitbake builds on systems which don't meet the \ | ||
5 | usual version requirements and have ancient compilers." | ||
6 | SUMMARY = "Standalone tarball for running builds on systems with inadequate software and ancient compilers" | ||
7 | LICENSE = "MIT" | ||
8 | |||
9 | # Add nativesdk equivalent of build-essentials | ||
10 | TOOLCHAIN_HOST_TASK += "\ | ||
11 | nativesdk-automake \ | ||
12 | nativesdk-autoconf \ | ||
13 | nativesdk-binutils \ | ||
14 | nativesdk-binutils-symlinks \ | ||
15 | nativesdk-cpp \ | ||
16 | nativesdk-cpp-symlinks \ | ||
17 | nativesdk-gcc \ | ||
18 | nativesdk-gcc-symlinks \ | ||
19 | nativesdk-g++ \ | ||
20 | nativesdk-g++-symlinks \ | ||
21 | nativesdk-gettext \ | ||
22 | nativesdk-libatomic \ | ||
23 | nativesdk-libgcc \ | ||
24 | nativesdk-libstdc++ \ | ||
25 | nativesdk-libstdc++-dev \ | ||
26 | nativesdk-libstdc++-staticdev \ | ||
27 | nativesdk-libtool \ | ||
28 | nativesdk-pkgconfig \ | ||
29 | nativesdk-glibc-utils \ | ||
30 | nativesdk-python \ | ||
31 | nativesdk-libxcrypt-dev \ | ||
32 | " | ||
33 | |||
34 | TOOLCHAIN_OUTPUTNAME = "${SDK_ARCH}-buildtools-extended-nativesdk-standalone-${DISTRO_VERSION}" | ||
35 | |||
36 | SDK_TITLE = "Extended Build tools" | ||
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 66201514d7..ceb60b0e48 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -73,7 +73,13 @@ create_sdk_files_append () { | |||
73 | toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} | 73 | toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} |
74 | 74 | ||
75 | echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script | 75 | echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script |
76 | echo 'export SSL_CERT_FILE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script | ||
77 | echo 'export OPENSSL_CONF="${SDKPATHNATIVE}${sysconfdir}/ssl/openssl.cnf"' >>$script | ||
76 | 78 | ||
79 | mkdir -p ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ | ||
80 | echo '${SDKPATHNATIVE}${libdir} | ||
81 | ${SDKPATHNATIVE}${base_libdir} | ||
82 | include /etc/ld.so.conf' > ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ld.so.conf | ||
77 | if [ "${SDKMACHINE}" = "i686" ]; then | 83 | if [ "${SDKMACHINE}" = "i686" ]; then |
78 | echo 'export NO32LIBS="0"' >>$script | 84 | echo 'export NO32LIBS="0"' >>$script |
79 | echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script | 85 | echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script |
diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 575254af40..0577a5ccac 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb | |||
@@ -13,8 +13,15 @@ deltask do_install | |||
13 | deltask do_populate_sysroot | 13 | deltask do_populate_sysroot |
14 | 14 | ||
15 | python () { | 15 | python () { |
16 | if not d.getVar("CVE_CHECK_DB_FILE"): | 16 | cve_check_db_file = d.getVar("CVE_CHECK_DB_FILE") |
17 | if not cve_check_db_file: | ||
17 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") | 18 | raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") |
19 | |||
20 | if os.path.exists("%s-journal" % cve_check_db_file ): | ||
21 | os.remove("%s-journal" % cve_check_db_file) | ||
22 | |||
23 | if os.path.exists(cve_check_db_file): | ||
24 | os.remove(cve_check_db_file) | ||
18 | } | 25 | } |
19 | 26 | ||
20 | python do_populate_cve_db() { | 27 | python do_populate_cve_db() { |
@@ -122,7 +129,7 @@ def parse_node_and_insert(c, node, cveId): | |||
122 | product = cpe23[4] | 129 | product = cpe23[4] |
123 | version = cpe23[5] | 130 | version = cpe23[5] |
124 | 131 | ||
125 | if version != '*': | 132 | if version != '*' and version != '-': |
126 | # Version is defined, this is a '=' match | 133 | # Version is defined, this is a '=' match |
127 | yield [cveId, vendor, product, version, '=', '', ''] | 134 | yield [cveId, vendor, product, version, '=', '', ''] |
128 | else: | 135 | else: |
@@ -160,15 +167,20 @@ def update_db(c, jsondata): | |||
160 | if not elt['impact']: | 167 | if not elt['impact']: |
161 | continue | 168 | continue |
162 | 169 | ||
170 | accessVector = None | ||
163 | cveId = elt['cve']['CVE_data_meta']['ID'] | 171 | cveId = elt['cve']['CVE_data_meta']['ID'] |
164 | cveDesc = elt['cve']['description']['description_data'][0]['value'] | 172 | cveDesc = elt['cve']['description']['description_data'][0]['value'] |
165 | date = elt['lastModifiedDate'] | 173 | date = elt['lastModifiedDate'] |
166 | accessVector = elt['impact']['baseMetricV2']['cvssV2']['accessVector'] | ||
167 | cvssv2 = elt['impact']['baseMetricV2']['cvssV2']['baseScore'] | ||
168 | |||
169 | try: | 174 | try: |
175 | accessVector = elt['impact']['baseMetricV2']['cvssV2']['accessVector'] | ||
176 | cvssv2 = elt['impact']['baseMetricV2']['cvssV2']['baseScore'] | ||
177 | except KeyError: | ||
178 | cvssv2 = 0.0 | ||
179 | try: | ||
180 | accessVector = accessVector or elt['impact']['baseMetricV3']['cvssV3']['attackVector'] | ||
170 | cvssv3 = elt['impact']['baseMetricV3']['cvssV3']['baseScore'] | 181 | cvssv3 = elt['impact']['baseMetricV3']['cvssV3']['baseScore'] |
171 | except: | 182 | except KeyError: |
183 | accessVector = accessVector or "UNKNOWN" | ||
172 | cvssv3 = 0.0 | 184 | cvssv3 = 0.0 |
173 | 185 | ||
174 | c.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?)", | 186 | c.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?)", |
diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc index 4d653706b1..0d15a37c35 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc | |||
@@ -17,6 +17,9 @@ ALLOW_EMPTY_${PN} = "1" | |||
17 | 17 | ||
18 | PR[vardeps] += "DUMMYPROVIDES" | 18 | PR[vardeps] += "DUMMYPROVIDES" |
19 | 19 | ||
20 | DUMMYPROVIDES_PACKAGES ??= "" | ||
21 | DUMMYPROVIDES += "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" | ||
22 | |||
20 | python populate_packages_prepend() { | 23 | python populate_packages_prepend() { |
21 | p = d.getVar("PN") | 24 | p = d.getVar("PN") |
22 | d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") | 25 | d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") |
diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb index 6a8748acdf..cfa41c4ae6 100644 --- a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}" | 1 | DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}" |
2 | 2 | ||
3 | DUMMYPROVIDES = "\ | 3 | DUMMYPROVIDES_PACKAGES = "\ |
4 | nativesdk-perl \ | 4 | nativesdk-perl \ |
5 | nativesdk-libxml-parser-perl \ | 5 | nativesdk-libxml-parser-perl \ |
6 | nativesdk-perl-module-bytes \ | 6 | nativesdk-perl-module-bytes \ |
@@ -15,12 +15,18 @@ DUMMYPROVIDES = "\ | |||
15 | nativesdk-perl-module-file-find \ | 15 | nativesdk-perl-module-file-find \ |
16 | nativesdk-perl-module-file-glob \ | 16 | nativesdk-perl-module-file-glob \ |
17 | nativesdk-perl-module-file-path \ | 17 | nativesdk-perl-module-file-path \ |
18 | nativesdk-perl-module-file-spec \ | ||
18 | nativesdk-perl-module-file-stat \ | 19 | nativesdk-perl-module-file-stat \ |
19 | nativesdk-perl-module-getopt-long \ | 20 | nativesdk-perl-module-getopt-long \ |
20 | nativesdk-perl-module-io-file \ | 21 | nativesdk-perl-module-io-file \ |
22 | nativesdk-perl-module-overloading \ | ||
21 | nativesdk-perl-module-posix \ | 23 | nativesdk-perl-module-posix \ |
22 | nativesdk-perl-module-thread-queue \ | 24 | nativesdk-perl-module-thread-queue \ |
23 | nativesdk-perl-module-threads \ | 25 | nativesdk-perl-module-threads \ |
26 | nativesdk-perl-module-warnings \ | ||
27 | " | ||
28 | |||
29 | DUMMYPROVIDES = "\ | ||
24 | /usr/bin/perl \ | 30 | /usr/bin/perl \ |
25 | " | 31 | " |
26 | 32 | ||
diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index b891efa5ef..29f4dd3633 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb | |||
@@ -1,10 +1,13 @@ | |||
1 | DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}" | 1 | DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}" |
2 | 2 | ||
3 | DUMMYPROVIDES_PACKAGES = "\ | ||
4 | pkgconfig \ | ||
5 | " | ||
6 | |||
3 | # Add /bin/sh? | 7 | # Add /bin/sh? |
4 | DUMMYPROVIDES = "\ | 8 | DUMMYPROVIDES = "\ |
5 | /bin/bash \ | 9 | /bin/bash \ |
6 | /usr/bin/env \ | 10 | /usr/bin/env \ |
7 | pkgconfig \ | ||
8 | libGL.so()(64bit) \ | 11 | libGL.so()(64bit) \ |
9 | libGL.so \ | 12 | libGL.so \ |
10 | " | 13 | " |
diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb index 87b8bfab9c..e3beeb796c 100644 --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb | |||
@@ -48,7 +48,6 @@ DUMMYPROVIDES_PACKAGES = "\ | |||
48 | " | 48 | " |
49 | 49 | ||
50 | DUMMYPROVIDES = "\ | 50 | DUMMYPROVIDES = "\ |
51 | ${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])} \ | ||
52 | /bin/sh \ | 51 | /bin/sh \ |
53 | /bin/bash \ | 52 | /bin/bash \ |
54 | /usr/bin/env \ | 53 | /usr/bin/env \ |