From bbbd5f468dc9c43b203cac3775f6c1b782ca7cba Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 30 Oct 2020 15:42:48 -0500 Subject: meta-openembedded: subtree update:2258c9a767..164a6030b0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alejandro Hernandez Samaniego (1): emacs: Fix packaging for emacs-minimal Andreas Müller (8): fluidsynth: upgrade 2.1.3 -> 2.1.5 hdf5: Shorten SUMMARY and move long text to DESCRIPTION wxwidgets: add opengl PACKAGECONFIG / enable it if opengl is in DISTRO_FEATURES wxwidgets: Add what's necessary so that consumers of wxwidgets_git can find it wxwidgets: upgrade 3.1.3 -> 3.1.4 babl: upgrade 0.1.78 -> 0.1.82 gegl: upgrade 0.4.24 -> 0.4.26 gimp: upgrade 2.10.20 -> 2.10.22 Andrej Valek (2): nss: upgrade 3.56 -> 3.57 nspr: upgrade 4.26 -> 4.29 Chen Qi (2): open-isns: use /run instead of /var/run in systemd service file openhpi: use /run instead of /var/run in systemd service file Daniel Ammann (2): dhex: add homepage pcsc-tools: add new package Fagundes, Paulo (1): vnstat: add recipe Gianfranco Costamagna (1): vboxguestdrivers: upgrade 6.1.14 -> 6.1.16 Gianluca Pacchiella (1): Add missing dependencies for rsnapshot. Khem Raj (5): meta-openembedded: Add gatesgarth to LAYERSERIES_COMPAT apitrace: Disable secuirty flags for clang iscsi-initiator-utils: Silence a clang warning on 64bit systems minifi-cpp: Do not use lld on riscv32 redis: Fix build with clang on riscv32 Leon Anavi (44): python3-aiohttp: Upgrade 3.6.2 -> 3.6.3 python3-ujson: Upgrade 3.2.0 -> 4.0.1 python3-passlib: Upgrade 1.7.2 -> 1.7.4 python3-croniter: Upgrade 0.3.34 -> 0.3.35 python3-isort: Upgrade 5.5.4 -> 5.6.4 python3-prompt-toolkit: Upgrade 3.0.7 -> 3.0.8 python3-yarl: Upgrade 1.6.0 -> 1.6.2 python3-sqlparse: Upgrade 0.3.1 -> 0.4.1 python3-sqlalchemy: Upgrade 1.3.19 -> 1.3.20 python3-sentry-sdk: Upgrade 0.18.0 -> 0.19.0 python3-markdown: Upgrade 3.3 -> 3.3.1 python3-pywbemtools: Upgrade 0.7.3 -> 0.8.0 python3-xlsxwriter: Upgrade 1.3.6 -> 1.3.7 python3-luma-core: Upgrade 1.17.1 -> 1.17.2 python3-graphviz: Upgrade 0.14.1 -> 0.14.2 python3-yappi: Upgrade 1.2.5 -> 1.3.0 python3-iniconfig: Upgrade 1.0.1 -> 1.1.1 transmission: Upgrade 2.94 -> 3.00 python3-regex: Upgrade 2020.10.11 -> 2020.10.15 python3-colorama: Upgrade 0.4.3 -> 0.4.4 python3-zipp: Upgrade 3.3.0 -> 3.3.1 python3-pychromecast: Upgrade 7.5.0 -> 7.5.1 python3-semver: Upgrade 2.10.2 -> 2.13.0 python3-pydicti: Upgrade 1.1.3 -> 1.1.4 python3-humanize: Upgrade 3.0.1 -> 3.1.0 python3-dominate: Upgrade 2.5.2 -> 2.6.0 python3-urllib3: Upgrade 1.25.10 -> 1.25.11 python3-bitarray: Upgrade 1.5.3 -> 1.6.0 python3-markdown: Upgrade 3.3.1 -> 3.3.2 python3-pymisp: Upgrade 2.4.131 -> 2.4.133 python3-typeguard: Upgrade 2.9.1 -> 2.10.0 python3-traitlets: Upgrade 5.0.4 -> 5.0.5 python3-sentry-sdk: Upgrade 0.19.0 -> 0.19.1 python3-lxml: Upgrade 4.5.2 -> 4.6.1 python3-regex: Upgrade 2020.10.15 -> 2020.10.23 python3-google-api-python-client: Upgrade 1.12.3 -> 1.12.5 python3-cryptography: Upgrade 3.1.1 -> 3.2 python3-psutil: Upgrade 5.7.2 -> 5.7.3 python3-pyparted: Upgrade 3.11.6 -> 3.11.7 python3-tqdm: Upgrade 4.50.2 -> 4.51.0 python3-u-msgpack-python: Upgrade 2.7.0 -> 2.7.1 python3-luma-core: Upgrade 1.17.2 -> 1.17.3 python3-zipp: Upgrade 3.3.1 -> 3.4.0 python3-aiohttp: Upgrade 3.6.3 -> 3.7.1 Luca Boccassi (2): Add recipe for fsverity-utils Add new recipe for squashfs-tools-ng Mario Schuknecht (1): wireguard-tools: Fix systemd service installation Martin Jansa (3): packagegroup-meta-multimedia: include fdk-aac and mpd only with commercial in LICENSE_FLAGS_WHITELIST python3-colorama: add native and nativesdk to BBCLASSEXTEND mpd: add commercial LICENSE_FLAGS when ffmpeg or aac PACKAGECONFIG is enabled Michael Tretter (1): apitrace: add new recipe Mingli Yu (1): mariadb: Upgrade to 10.5.6 Pascal Bach (1): fmt: make available as native and nativesdk Pierre-Jean Texier (3): c-periphery: upgrade 2.2.1 -> 2.2.4 c-periphery: fix typo in SUMMARY stunnel: upgrade 5.56 -> 5.57 Qi.Chen@windriver.com (4): php: use /run instead /var/run in systemd service file lmsensors: use /run instead of /var/run for systemd service cyrus-sasl: use /run instead of /var/run for systemd service file freediameter: use /run instead of /var/run in systemd service file Ross Burton (2): mpv: fetch waf in do_fetch glmark2: no need to patch waf Sakib Sajal (1): python3-prettytable: add python3-wcwidth to RDEPENDS Siming Yuan (1): python3-paramiko: fixing runtime dependencies Taisei Nakano (1): anthy: add GPLv2 to LICENSE and add LIC_FILES_CHKSUM Ulrich Ölmann (1): usb-modeswitch, usb-modeswitch-data: fix usrmerge Yi Zhao (2): samba: upgrade 4.10.17 -> 4.10.18 networkmanager: remove PACKAGECONFIG[dhclient] Zang Ruochen (13): firewalld: upgrade 0.9.0 -> 0.9.1 mtr: upgrade 0.93 -> 0.94 wireshark: upgrade 3.2.6 -> 3.2.7 hwdata: upgrade 0.339 -> 0.340 libmbim: upgrade 1.24.2 -> 1.24.4 linuxptp: upgrade 3.0 -> 3.1 memtester: upgrade 4.4.0 -> 4.5.0 paho-mqtt-c: upgrade 1.3.5 -> 1.3.6 mm-common: upgrade 1.0.1 -> 1.0.2 poppler: upgrade 20.09.0 -> 20.10.0 spdlog: upgrade 1.8.0 -> 1.8.1 libcgi-perl: upgrade 4.50 -> 4.51 libcurses-perl: upgrade 1.36 -> 1.37 zangrc (8): gphoto2: upgrade 2.5.23 -> 2.5.26 libgphoto2: upgrade 2.5.25 -> 2.5.26 libmtp: upgrade 1.1.17 -> 1.1.18 libp11: upgrade 0.4.10 -> 0.4.11 libpwquality: upgrade 1.4.2 -> 1.4.4 libqmi: upgrade 1.26.4 -> 1.26.6 nano: upgrade 5.2 -> 5.3 protobuf: upgrade 3.13.0 -> 3.13.0.1 Signed-off-by: Andrew Geissler Change-Id: Ie105cfe99ae7dab0f6f1fd8d88d43a1979faf486 --- .../meta-oe/recipes-support/anthy/anthy_9100h.bb | 6 +- .../c-periphery/c-periphery_2.2.1.bb | 21 -- .../c-periphery/c-periphery_2.2.4.bb | 21 ++ .../meta-oe/recipes-support/dhex/dhex_0.69.bb | 1 + .../meta-oe/recipes-support/emacs/emacs_27.1.bb | 1 + .../meta-oe/recipes-support/fmt/fmt_7.0.3.bb | 2 + .../meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb | 3 +- .../meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- .../recipes-support/libp11/libp11_0.4.10.bb | 30 --- .../recipes-support/libp11/libp11_0.4.11.bb | 30 +++ .../meta-oe/recipes-support/nano/nano_5.2.bb | 21 -- .../meta-oe/recipes-support/nano/nano_5.3.bb | 21 ++ .../meta-oe/recipes-support/nspr/nspr_4.26.bb | 197 --------------- .../meta-oe/recipes-support/nspr/nspr_4.29.bb | 197 +++++++++++++++ ...a-configure-option-to-disable-ARM-HW-cryp.patch | 36 ++- ...01-pkix-Do-not-use-NULL-where-0-is-needed.patch | 46 ---- .../meta-oe/recipes-support/nss/nss_3.56.bb | 272 --------------------- .../meta-oe/recipes-support/nss/nss_3.57.bb | 271 ++++++++++++++++++++ .../recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb | 16 ++ .../recipes-support/poppler/poppler_20.09.0.bb | 51 ---- .../recipes-support/poppler/poppler_20.10.0.bb | 51 ++++ .../recipes-support/rsnapshot/rsnapshot_git.bb | 2 + .../meta-oe/recipes-support/spdlog/spdlog_1.8.0.bb | 21 -- .../meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb | 21 ++ .../usb-modeswitch/usb-modeswitch-data_20191128.bb | 4 +- .../usb-modeswitch/usb-modeswitch_2.6.0.bb | 2 +- .../vboxguestdrivers/vboxguestdrivers_6.1.14.bb | 82 ------- .../vboxguestdrivers/vboxguestdrivers_6.1.16.bb | 82 +++++++ 28 files changed, 750 insertions(+), 762 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_5.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.09.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb (limited to 'meta-openembedded/meta-oe/recipes-support') diff --git a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb index a65d324eae..9d78c3457c 100644 --- a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -2,8 +2,10 @@ DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana t AUTHOR = "Anthy Developers " HOMEPAGE = "http://anthy.sourceforge.jp" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=11f384074d8e93e263b5664ef08a411a \ + file://alt-cannadic/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ +" SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \ file://not_build_elc.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb deleted file mode 100644 index b53cd6b19f..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMURY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" -DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" - -HOMEPAGE = "https://github.com/vsergeev/c-periphery" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" - -SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" -SRCREV = "c2aa7d164f87b807077daeeb3443a56b89e1d1c9" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb new file mode 100644 index 0000000000..621e174ff0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/c-periphery/c-periphery_2.2.4.bb @@ -0,0 +1,21 @@ +SUMMARY = "C-Periphery lib used to access GPIO, LED, PWM, SPI, I2C, MMIO, Serial" +DESCRIPTION = "A C library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) in Linux" + +HOMEPAGE = "https://github.com/vsergeev/c-periphery" + +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4097ec544cf01e9c7cfc4bdf8e4ed887" + +SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https" +SRCREV = "d34077d7ee45fa7d1947cc0174919452fac31597" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb index cfbb2caaf6..6f8c86a169 100644 --- a/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb +++ b/meta-openembedded/meta-oe/recipes-support/dhex/dhex_0.69.bb @@ -1,5 +1,6 @@ SUMMARY = "dhex is a hex editor that includes a diff mode" SECTION = "console/utils" +HOMEPAGE = "http://www.dettus.net/dhex/" DEPENDS = "ncurses" diff --git a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb index 9b3adcf9d8..cfc089b3b6 100644 --- a/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/emacs/emacs_27.1.bb @@ -177,6 +177,7 @@ FILES_${PN}-minimal = " \ ${datadir}/${BPN}/${PV}/lisp/international/uni*.el \ ${datadir}/${BPN}/${PV}/lisp/emacs-lisp/vc/warnings.elc \ ${datadir}/${BPN}/${PV}/etc/charsets/ \ + ${datadir}/${BPN}/${PV}/lisp/disp-table.elc \ ${bindir}/emacs* \ ${prefix}/libexec \ " diff --git a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb index ed3de0b500..d52731161a 100644 --- a/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/fmt/fmt_7.0.3.bb @@ -13,3 +13,5 @@ inherit cmake inherit ptest EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb index 9af2b67149..11285451aa 100644 --- a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.8.21.bb @@ -1,4 +1,5 @@ -SUMMARY = "Unique technology suite that makes possible the management of \ +SUMMARY = "Management suite for extremely large and complex data collections" +DESCRIPTION = "Unique technology suite that makes possible the management of \ extremely large and complex data collections" HOMEPAGE = "https://www.hdfgroup.org/" SECTION = "libs" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index 42b92106b1..cc12a6890c 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.339" -SRCREV = "1cd8ee29eb2dcb954961be008b96cfbf982f0700" +PV = "0.340" +SRCREV = "60d9f39b0542607fcc436e7aebf6b05a9ca674ff" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb deleted file mode 100644 index 7fe0640d94..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Library for using PKCS" -DESCRIPTION = "\ -Libp11 is a library implementing a small layer on top of PKCS \ -make using PKCS" -HOMEPAGE = "https://github.com/OpenSC/libp11" -BUGTRACKER = "https://github.com/OpenSC/libp11/issues" -SECTION = "Development/Libraries" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" -DEPENDS = "libtool openssl" - -SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" - -UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-static" - -do_install_append () { - rm -rf ${D}${docdir}/${BPN} -} - -FILES_${PN} += "${libdir}/engines*/pkcs11.so" -FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb new file mode 100644 index 0000000000..1c5cc52bf4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.11.bb @@ -0,0 +1,30 @@ +SUMMARY = "Library for using PKCS" +DESCRIPTION = "\ +Libp11 is a library implementing a small layer on top of PKCS \ +make using PKCS" +HOMEPAGE = "https://github.com/OpenSC/libp11" +BUGTRACKER = "https://github.com/OpenSC/libp11/issues" +SECTION = "Development/Libraries" +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" +DEPENDS = "libtool openssl" + +SRC_URI = "git://github.com/OpenSC/libp11.git" +SRCREV = "9ca6a71c890b5583c8af3b4900172626bca55e72" + +UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-static" + +do_install_append () { + rm -rf ${D}${docdir}/${BPN} +} + +FILES_${PN} += "${libdir}/engines*/pkcs11.so" +FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.2.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.2.bb deleted file mode 100644 index f2cd2909cf..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ -Not ANOther editor) is an enhanced clone of the \ -Pico text editor." -HOMEPAGE = "http://www.nano-editor.org/" -SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" - -PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" - -SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "32c2da43e1ae9a5e43437d8c6e1ec0388af870c7762c479e5bffb5f292bda7e1" - -UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb new file mode 100644 index 0000000000..48e92de4cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.3.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ +Not ANOther editor) is an enhanced clone of the \ +Pico text editor." +HOMEPAGE = "http://www.nano-editor.org/" +SECTION = "console/utils" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "ncurses file" +RDEPENDS_${PN} = "ncurses-terminfo-base" + +PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" + +SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" +SRC_URI[sha256sum] = "c5c1cbcf622d9a96b6030d66409ed12b204e8bc01ef5e6554ebbe6fb1d734352" + +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb deleted file mode 100644 index a15afd667b..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.26.bb +++ /dev/null @@ -1,197 +0,0 @@ -SUMMARY = "Netscape Portable Runtime Library" -HOMEPAGE = "http://www.mozilla.org/projects/nspr/" -LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" -LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ - file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" -SECTION = "libs/network" - -SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ - file://remove-rpath-from-tests.patch \ - file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ - file://0002-Add-nios2-support.patch \ - file://0001-md-Fix-build-with-musl.patch \ - file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ - file://nspr.pc.in \ -" - -CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" - -UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" -UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" - -SRC_URI[md5sum] = "615695d57eaafa1fca085d3891befd68" -SRC_URI[sha256sum] = "fc9d142d85b74ffd2e6374a0c9016f3f2dac074225e24df3070e5a72d31b773d" - -CVE_PRODUCT = "netscape_portable_runtime" - -S = "${WORKDIR}/nspr-${PV}/nspr" - -RDEPENDS_${PN}-dev += "perl" -TARGET_CC_ARCH += "${LDFLAGS}" - -TESTS = " \ - accept \ - acceptread \ - acceptreademu \ - affinity \ - alarm \ - anonfm \ - atomic \ - attach \ - bigfile \ - cleanup \ - cltsrv \ - concur \ - cvar \ - cvar2 \ - dlltest \ - dtoa \ - errcodes \ - exit \ - fdcach \ - fileio \ - foreign \ - formattm \ - fsync \ - gethost \ - getproto \ - i2l \ - initclk \ - inrval \ - instrumt \ - intrio \ - intrupt \ - io_timeout \ - ioconthr \ - join \ - joinkk \ - joinku \ - joinuk \ - joinuu \ - layer \ - lazyinit \ - libfilename \ - lltest \ - lock \ - lockfile \ - logfile \ - logger \ - many_cv \ - multiwait \ - nameshm1 \ - nblayer \ - nonblock \ - ntioto \ - ntoh \ - op_2long \ - op_excl \ - op_filnf \ - op_filok \ - op_nofil \ - parent \ - parsetm \ - peek \ - perf \ - pipeping \ - pipeping2 \ - pipeself \ - poll_nm \ - poll_to \ - pollable \ - prftest \ - primblok \ - provider \ - prpollml \ - ranfile \ - randseed \ - reinit \ - rwlocktest \ - sel_spd \ - selct_er \ - selct_nm \ - selct_to \ - selintr \ - sema \ - semaerr \ - semaping \ - sendzlf \ - server_test \ - servr_kk \ - servr_uk \ - servr_ku \ - servr_uu \ - short_thread \ - sigpipe \ - socket \ - sockopt \ - sockping \ - sprintf \ - stack \ - stdio \ - str2addr \ - strod \ - switch \ - system \ - testbit \ - testfile \ - threads \ - timemac \ - timetest \ - tpd \ - udpsrv \ - vercheck \ - version \ - writev \ - xnotify \ - zerolen" - -inherit autotools multilib_script - -MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -# Do not install nspr in usr/include, but in usr/include/nspr, the -# preferred path upstream. -EXTRA_OECONF += "--includedir=${includedir}/nspr" - -do_compile_prepend() { - oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export -} - -do_compile_append() { - oe_runmake -C pr/tests -} - -do_install_append() { - install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc - sed -i \ - -e 's:NSPRVERSION:${PV}:g' \ - -e 's:OEPREFIX:${prefix}:g' \ - -e 's:OELIBDIR:${libdir}:g' \ - -e 's:OEINCDIR:${includedir}:g' \ - -e 's:OEEXECPREFIX:${exec_prefix}:g' \ - ${D}${libdir}/pkgconfig/nspr.pc - - mkdir -p ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests - install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests - cd ${B}/pr/tests - install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests - - # delete compile-et.pl and perr.properties from ${bindir} because these are - # only used to generate prerr.c and prerr.h files from prerr.et at compile - # time - rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties -} - -FILES_${PN} = "${libdir}/lib*.so" -FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ - ${includedir}/* ${datadir}/aclocal/* " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb new file mode 100644 index 0000000000..6307c159eb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nspr/nspr_4.29.bb @@ -0,0 +1,197 @@ +SUMMARY = "Netscape Portable Runtime Library" +HOMEPAGE = "http://www.mozilla.org/projects/nspr/" +LICENSE = "GPL-2.0 | MPL-2.0 | LGPL-2.1" +LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d6302abcfe475c8b5c5 \ + file://Makefile.in;beginline=4;endline=38;md5=beda1dbb98a515f557d3e58ef06bca99" +SECTION = "libs/network" + +SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ + file://remove-rpath-from-tests.patch \ + file://fix-build-on-x86_64.patch \ + file://remove-srcdir-from-configure-in.patch \ + file://0002-Add-nios2-support.patch \ + file://0001-md-Fix-build-with-musl.patch \ + file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://nspr.pc.in \ +" + +CACHED_CONFIGUREVARS_append_libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ + -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ + -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ + -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" + +UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" +UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" + +SRC_URI[md5sum] = "a546926d3c8e887be02c668c1293da92" +SRC_URI[sha256sum] = "22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582" + +CVE_PRODUCT = "netscape_portable_runtime" + +S = "${WORKDIR}/nspr-${PV}/nspr" + +RDEPENDS_${PN}-dev += "perl" +TARGET_CC_ARCH += "${LDFLAGS}" + +TESTS = " \ + accept \ + acceptread \ + acceptreademu \ + affinity \ + alarm \ + anonfm \ + atomic \ + attach \ + bigfile \ + cleanup \ + cltsrv \ + concur \ + cvar \ + cvar2 \ + dlltest \ + dtoa \ + errcodes \ + exit \ + fdcach \ + fileio \ + foreign \ + formattm \ + fsync \ + gethost \ + getproto \ + i2l \ + initclk \ + inrval \ + instrumt \ + intrio \ + intrupt \ + io_timeout \ + ioconthr \ + join \ + joinkk \ + joinku \ + joinuk \ + joinuu \ + layer \ + lazyinit \ + libfilename \ + lltest \ + lock \ + lockfile \ + logfile \ + logger \ + many_cv \ + multiwait \ + nameshm1 \ + nblayer \ + nonblock \ + ntioto \ + ntoh \ + op_2long \ + op_excl \ + op_filnf \ + op_filok \ + op_nofil \ + parent \ + parsetm \ + peek \ + perf \ + pipeping \ + pipeping2 \ + pipeself \ + poll_nm \ + poll_to \ + pollable \ + prftest \ + primblok \ + provider \ + prpollml \ + ranfile \ + randseed \ + reinit \ + rwlocktest \ + sel_spd \ + selct_er \ + selct_nm \ + selct_to \ + selintr \ + sema \ + semaerr \ + semaping \ + sendzlf \ + server_test \ + servr_kk \ + servr_uk \ + servr_ku \ + servr_uu \ + short_thread \ + sigpipe \ + socket \ + sockopt \ + sockping \ + sprintf \ + stack \ + stdio \ + str2addr \ + strod \ + switch \ + system \ + testbit \ + testfile \ + threads \ + timemac \ + timetest \ + tpd \ + udpsrv \ + vercheck \ + version \ + writev \ + xnotify \ + zerolen" + +inherit autotools multilib_script + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/nspr-config" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +# Do not install nspr in usr/include, but in usr/include/nspr, the +# preferred path upstream. +EXTRA_OECONF += "--includedir=${includedir}/nspr" + +do_compile_prepend() { + oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export +} + +do_compile_append() { + oe_runmake -C pr/tests +} + +do_install_append() { + install -D ${WORKDIR}/nspr.pc.in ${D}${libdir}/pkgconfig/nspr.pc + sed -i \ + -e 's:NSPRVERSION:${PV}:g' \ + -e 's:OEPREFIX:${prefix}:g' \ + -e 's:OELIBDIR:${libdir}:g' \ + -e 's:OEINCDIR:${includedir}:g' \ + -e 's:OEEXECPREFIX:${exec_prefix}:g' \ + ${D}${libdir}/pkgconfig/nspr.pc + + mkdir -p ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.pl ${D}${libdir}/nspr/tests + install -m 0755 ${S}/pr/tests/runtests.sh ${D}${libdir}/nspr/tests + cd ${B}/pr/tests + install -m 0755 ${TESTS} ${D}${libdir}/nspr/tests + + # delete compile-et.pl and perr.properties from ${bindir} because these are + # only used to generate prerr.c and prerr.h files from prerr.et at compile + # time + rm ${D}${bindir}/compile-et.pl ${D}${bindir}/prerr.properties +} + +FILES_${PN} = "${libdir}/lib*.so" +FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ + ${includedir}/* ${datadir}/aclocal/* " + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index bfc375e83a..65e1500ae5 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -10,22 +10,24 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin --- - nss/lib/freebl/Makefile | 4 ++++ + nss/lib/freebl/Makefile | 3 +++ nss/lib/freebl/gcm.c | 2 ++ - 2 files changed, 6 insertions(+) + 2 files changed, 5 insertions(+) +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index fe8c526..922f67c 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -126,6 +126,8 @@ else +@@ -125,6 +125,8 @@ else + DEFINES += -DNSS_X86 endif endif - ifdef NS_USE_GCC +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c -@@ -150,6 +152,7 @@ endif + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 +@@ -166,6 +168,7 @@ endif endif endif endif @@ -33,15 +35,23 @@ Signed-off-by: Alexander Kanavin ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index c2cc18d..b77f573 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c -@@ -21,7 +21,9 @@ +@@ -18,6 +18,7 @@ + + #include + ++#ifdef NSS_USE_ARM_HW_CRYPTO /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -+# ifdef NSS_USE_ARM_HW_CRYPTO - #define USE_ARM_GCM -+# endif - #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \ - !defined(NSS_DISABLE_ARM32_NEON) +@@ -27,6 +28,7 @@ /* We don't test on big endian platform, so disable this on big endian. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch b/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch deleted file mode 100644 index 432312da25..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 26 Aug 2020 17:30:40 -0700 -Subject: [PATCH] pkix: Do not use NULL where 0 is needed - -Clang finds this error - -pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -2 errors generated. - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378] -Signed-off-by: Khem Raj ---- - nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c -index a916e6e..10f537a 100644 ---- a/nss/lib/libpkix/pkix/util/pkix_logger.c -+++ b/nss/lib/libpkix/pkix/util/pkix_logger.c -@@ -313,7 +313,7 @@ pkix_Logger_Destroy( - - logger->callback = NULL; - PKIX_DECREF(logger->context); -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - cleanup: - -@@ -614,7 +614,7 @@ PKIX_Logger_Create( - - logger->callback = callback; - logger->maxLevel = 0; -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - PKIX_INCREF(loggerContext); - logger->context = loggerContext; --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb deleted file mode 100644 index 997f8950fd..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.56.bb +++ /dev/null @@ -1,272 +0,0 @@ -SUMMARY = "Mozilla's SSL and TLS implementation" -DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ -designed to support cross-platform development of \ -security-enabled client and server applications. \ -Applications built with NSS can support SSL v2 and v3, \ -TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ -v3 certificates, and other security standards." -HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" -SECTION = "libs" - -DEPENDS = "sqlite3 nspr zlib nss-native" -DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" - -LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" - -LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ - file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ - file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" - -VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" - -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ - file://nss.pc.in \ - file://0001-nss-fix-support-cross-compiling.patch \ - file://nss-no-rpath-for-cross-compiling.patch \ - file://nss-fix-incorrect-shebang-of-perl.patch \ - file://disable-Wvarargs-with-clang.patch \ - file://pqg.c-ULL_addend.patch \ - file://blank-cert9.db \ - file://blank-key4.db \ - file://system-pkcs11.txt \ - file://nss-fix-nsinstall-build.patch \ - file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \ - " -SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c" - -UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" -UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" - -inherit siteinfo - -TD = "${S}/tentative-dist" -TDS = "${S}/tentative-dist-staging" - -# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a -# which caused -march conflicts in gcc -TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend_libc-musl () { - sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk -} - -do_compile_prepend_class-native() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr - export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} -} - -do_compile_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_compile_prepend_class-native() { - # Need to set RPATH so that chrpath will do its job correctly - RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" -} - -do_compile() { - export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr - export NSS_ENABLE_WERROR=0 - - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - # Additional defines needed on Centos 7 - export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - export FREEBL_LOWHASH=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - # We can modify CC in the environment, but if we set it via an - # argument to make, nsinstall, a host program, will also build with it! - # - # nss pretty much does its own thing with CFLAGS, so we put them into CC. - # Optimization will get clobbered, but most of the stuff will survive. - # The motivation for this is to point to the correct place for debug - # source files and CFLAGS does that. Nothing uses CCC. - # - export CC="${CC} ${CFLAGS}" - make -C ./nss CCC="${CXX} -g" \ - OS_TEST=${OS_TEST} \ - RPATH="${RPATH}" \ - autobuild -} - -do_compile[vardepsexclude] += "SITEINFO_BITS" - -do_install_prepend_class-nativesdk() { - export LDFLAGS="" -} - -do_install() { - export CROSS_COMPILE=1 - export NATIVE_CC="${BUILD_CC}" - export BUILD_OPT=1 - - export FREEBL_NO_DEPEND=1 - - export LIBDIR=${libdir} - export MOZILLA_CLIENT=1 - export NS_USE_GCC=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSS_ENABLE_ECC=1 - - export OS_RELEASE=3.4 - export OS_TARGET=Linux - export OS_ARCH=Linux - - if [ "${TARGET_ARCH}" = "powerpc" ]; then - OS_TEST=ppc - elif [ "${TARGET_ARCH}" = "powerpc64" ]; then - OS_TEST=ppc64 - elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then - OS_TEST=mips - elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then - CPU_ARCH=aarch64 - OS_TEST="aarch64" - else - OS_TEST="${TARGET_ARCH}" - fi - if [ "${SITEINFO_BITS}" = "64" ]; then - export USE_64=1 - elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then - export USE_X32=1 - fi - - export NSS_DISABLE_GTESTS=1 - - make -C ./nss \ - CCC="${CXX}" \ - OS_TEST=${OS_TEST} \ - SOURCE_LIB_DIR="${TD}/${libdir}" \ - SOURCE_BIN_DIR="${TD}/${bindir}" \ - install - - install -d ${D}/${libdir}/ - for file in ${S}/dist/*.OBJ/lib/*.so; do - echo "Installing `basename $file`..." - cp $file ${D}/${libdir}/ - done - - for shared_lib in ${TD}/${libdir}/*.so.*; do - if [ -f $shared_lib ]; then - cp $shared_lib ${D}/${libdir} - ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) - fi - done - for shared_lib in ${TD}/${libdir}/*.so; do - if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then - cp $shared_lib ${D}/${libdir} - fi - done - - install -d ${D}/${includedir}/nss3 - install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* - - install -d ${D}/${bindir} - for binary in ${TD}/${bindir}/*; do - install -m 755 -t ${D}/${bindir} $binary - done -} - -do_install[vardepsexclude] += "SITEINFO_BITS" - -do_install_append() { - # Create empty .chk files for the NSS libraries at build time. They could - # be regenerated at target's boot time. - for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do - touch ${D}/${libdir}/$file - chmod 755 ${D}/${libdir}/$file - done - - install -d ${D}${libdir}/pkgconfig/ - sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc - sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc -} - -do_install_append_class-target() { - # It used to call certutil to create a blank certificate with empty password at - # build time, but the checksum of key4.db changes every time when certutil is called. - # It causes non-determinism issue, so provide databases with a blank certificate - # which are originally from output of nss in qemux86-64 build. You can get these - # databases by: - # certutil -N -d sql:/database/path/ --empty-password - install -d ${D}${sysconfdir}/pki/nssdb/ - install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db - install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db - install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt -} - -PACKAGE_WRITE_DEPS += "nss-native" - -pkg_postinst_${PN} () { - for I in $D${libdir}/lib*.chk; do - DN=`dirname $I` - BN=`basename $I .chk` - FN=$DN/$BN.so - shlibsign -i $FN - if [ $? -ne 0 ]; then - echo "shlibsign -i $FN failed" - fi - done -} - -PACKAGES =+ "${PN}-smime" -FILES_${PN}-smime = "\ - ${bindir}/smime \ -" - -FILES_${PN} = "\ - ${sysconfdir} \ - ${bindir} \ - ${libdir}/lib*.chk \ - ${libdir}/lib*.so \ - " - -FILES_${PN}-dev = "\ - ${libdir}/nss \ - ${libdir}/pkgconfig/* \ - ${includedir}/* \ - " - -RDEPENDS_${PN}-smime = "perl" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb new file mode 100644 index 0000000000..5d9318a922 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.57.bb @@ -0,0 +1,271 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server applications. \ +Applications built with NSS can support SSL v2 and v3, \ +TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 \ +v3 certificates, and other security standards." +HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/" +SECTION = "libs" + +DEPENDS = "sqlite3 nspr zlib nss-native" +DEPENDS_class-native = "sqlite3-native nspr-native zlib-native" + +LICENSE = "MPL-2.0 | (MPL-2.0 & GPL-2.0+) | (MPL-2.0 & LGPL-2.1+)" + +LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ + file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ + file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132" + +VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" + +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ + file://nss.pc.in \ + file://0001-nss-fix-support-cross-compiling.patch \ + file://nss-no-rpath-for-cross-compiling.patch \ + file://nss-fix-incorrect-shebang-of-perl.patch \ + file://disable-Wvarargs-with-clang.patch \ + file://pqg.c-ULL_addend.patch \ + file://blank-cert9.db \ + file://blank-key4.db \ + file://system-pkcs11.txt \ + file://nss-fix-nsinstall-build.patch \ + file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ + " +SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382" + +UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" +UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" + +inherit siteinfo + +TD = "${S}/tentative-dist" +TDS = "${S}/tentative-dist-staging" + +# cortex-a55 is ARMv8.2-a based but libatomic explicitly asks for -march=armv8.1-a +# which caused -march conflicts in gcc +TUNE_CCARGS_remove = "-mcpu=cortex-a55+crc -mcpu=cortex-a55 -mcpu=cortex-a55+crc+crypto" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure_prepend_libc-musl () { + sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk +} + +do_compile_prepend_class-native() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR_NATIVE}/nspr + export NSPR_LIB_DIR=${STAGING_LIBDIR_NATIVE} +} + +do_compile_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_compile_prepend_class-native() { + # Need to set RPATH so that chrpath will do its job correctly + RPATH="-Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE}" +} + +do_compile() { + export NSPR_INCLUDE_DIR=${STAGING_INCDIR}/nspr + export NSS_ENABLE_WERROR=0 + + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + # Additional defines needed on Centos 7 + export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + export FREEBL_LOWHASH=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + ${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)} + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + # We can modify CC in the environment, but if we set it via an + # argument to make, nsinstall, a host program, will also build with it! + # + # nss pretty much does its own thing with CFLAGS, so we put them into CC. + # Optimization will get clobbered, but most of the stuff will survive. + # The motivation for this is to point to the correct place for debug + # source files and CFLAGS does that. Nothing uses CCC. + # + export CC="${CC} ${CFLAGS}" + make -C ./nss CCC="${CXX} -g" \ + OS_TEST=${OS_TEST} \ + RPATH="${RPATH}" \ + autobuild +} + +do_compile[vardepsexclude] += "SITEINFO_BITS" + +do_install_prepend_class-nativesdk() { + export LDFLAGS="" +} + +do_install() { + export CROSS_COMPILE=1 + export NATIVE_CC="${BUILD_CC}" + export BUILD_OPT=1 + + export FREEBL_NO_DEPEND=1 + + export LIBDIR=${libdir} + export MOZILLA_CLIENT=1 + export NS_USE_GCC=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSS_ENABLE_ECC=1 + + export OS_RELEASE=3.4 + export OS_TARGET=Linux + export OS_ARCH=Linux + + if [ "${TARGET_ARCH}" = "powerpc" ]; then + OS_TEST=ppc + elif [ "${TARGET_ARCH}" = "powerpc64" ]; then + OS_TEST=ppc64 + elif [ "${TARGET_ARCH}" = "mips" -o "${TARGET_ARCH}" = "mipsel" -o "${TARGET_ARCH}" = "mips64" -o "${TARGET_ARCH}" = "mips64el" ]; then + OS_TEST=mips + elif [ "${TARGET_ARCH}" = "aarch64_be" ]; then + CPU_ARCH=aarch64 + OS_TEST="aarch64" + else + OS_TEST="${TARGET_ARCH}" + fi + if [ "${SITEINFO_BITS}" = "64" ]; then + export USE_64=1 + elif [ "${TARGET_ARCH}" = "x86_64" -a "${SITEINFO_BITS}" = "32" ]; then + export USE_X32=1 + fi + + export NSS_DISABLE_GTESTS=1 + + make -C ./nss \ + CCC="${CXX}" \ + OS_TEST=${OS_TEST} \ + SOURCE_LIB_DIR="${TD}/${libdir}" \ + SOURCE_BIN_DIR="${TD}/${bindir}" \ + install + + install -d ${D}/${libdir}/ + for file in ${S}/dist/*.OBJ/lib/*.so; do + echo "Installing `basename $file`..." + cp $file ${D}/${libdir}/ + done + + for shared_lib in ${TD}/${libdir}/*.so.*; do + if [ -f $shared_lib ]; then + cp $shared_lib ${D}/${libdir} + ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe) + fi + done + for shared_lib in ${TD}/${libdir}/*.so; do + if [ -f $shared_lib -a ! -e ${D}/${libdir}/$shared_lib ]; then + cp $shared_lib ${D}/${libdir} + fi + done + + install -d ${D}/${includedir}/nss3 + install -m 644 -t ${D}/${includedir}/nss3 dist/public/nss/* + + install -d ${D}/${bindir} + for binary in ${TD}/${bindir}/*; do + install -m 755 -t ${D}/${bindir} $binary + done +} + +do_install[vardepsexclude] += "SITEINFO_BITS" + +do_install_append() { + # Create empty .chk files for the NSS libraries at build time. They could + # be regenerated at target's boot time. + for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do + touch ${D}/${libdir}/$file + chmod 755 ${D}/${libdir}/$file + done + + install -d ${D}${libdir}/pkgconfig/ + sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc + sed -i s:OEINCDIR:${includedir}/nss3:g ${D}${libdir}/pkgconfig/nss.pc +} + +do_install_append_class-target() { + # It used to call certutil to create a blank certificate with empty password at + # build time, but the checksum of key4.db changes every time when certutil is called. + # It causes non-determinism issue, so provide databases with a blank certificate + # which are originally from output of nss in qemux86-64 build. You can get these + # databases by: + # certutil -N -d sql:/database/path/ --empty-password + install -d ${D}${sysconfdir}/pki/nssdb/ + install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db + install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db + install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt +} + +PACKAGE_WRITE_DEPS += "nss-native" + +pkg_postinst_${PN} () { + for I in $D${libdir}/lib*.chk; do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + shlibsign -i $FN + if [ $? -ne 0 ]; then + echo "shlibsign -i $FN failed" + fi + done +} + +PACKAGES =+ "${PN}-smime" +FILES_${PN}-smime = "\ + ${bindir}/smime \ +" + +FILES_${PN} = "\ + ${sysconfdir} \ + ${bindir} \ + ${libdir}/lib*.chk \ + ${libdir}/lib*.so \ + " + +FILES_${PN}-dev = "\ + ${libdir}/nss \ + ${libdir}/pkgconfig/* \ + ${includedir}/* \ + " + +RDEPENDS_${PN}-smime = "perl" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb new file mode 100644 index 0000000000..bc82e49ead --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.5.7.bb @@ -0,0 +1,16 @@ +SUMMARY = "Some tools to be used with smart cards and PC/SC" +HOMEPAGE = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https" + +SRCREV = "34ac207adbba0d1a951b314c1676610a1d0bba01" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" + +DEPENDS = "pcsc-lite" + +FILES_${PN} += "${datadir}/pcsc/smartcard_list.txt" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.09.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.09.0.bb deleted file mode 100644 index ceff2d0d65..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.09.0.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[sha256sum] = "4ed6eb5ddc4c37f2435c9d78ff9c7c4036455aea3507d1ce8400070aab745363" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" - -do_configure_append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb new file mode 100644 index 0000000000..0f04b88f2d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_20.10.0.bb @@ -0,0 +1,51 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "434ecbbb539c1a75955030a1c9b24c7b58200b7f68d2e4269e29acf2f8f13336" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" + +do_configure_append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index dcadede0ed..33f5dccca2 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -13,11 +13,13 @@ RDEPENDS_${PN} = "rsync \ perl-module-getopt-std \ perl-module-file-path \ perl-module-file-stat \ + perl-module-file-spec \ perl-module-posix \ perl-module-fcntl \ perl-module-io-file \ perl-module-constant \ perl-module-overloading \ + perl-module-ipc-open3 \ " SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.0.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.0.bb deleted file mode 100644 index b79eb7c28b..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Very fast, header only, C++ logging library." -HOMEPAGE = "https://github.com/gabime/spdlog/wiki" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRCREV = "4a9ccf7e38e257feecce0c579a782741254eaeef" -SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" - -DEPENDS += "fmt" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native" -# no need to build example&text&benchmarks on pure yocto -EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" - -inherit cmake - -# Header-only library -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb new file mode 100644 index 0000000000..7d28fff5e3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.8.1.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Very fast, header only, C++ logging library." +HOMEPAGE = "https://github.com/gabime/spdlog/wiki" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRCREV = "cbe9448650176797739dbab13961ef4c07f4290f" +SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;" + +DEPENDS += "fmt" + +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native" +# no need to build example&text&benchmarks on pure yocto +EXTRA_OECMAKE += "-DSPDLOG_INSTALL=on -DSPDLOG_BUILD_EXAMPLES=off -DSPDLOG_BUILD_TESTS=off -DSPDLOG_BUILD_BENCH=off -DSPDLOG_FMT_EXTERNAL=on" + +inherit cmake + +# Header-only library +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb index 938c0f9c26..ca970e59bb 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb @@ -11,9 +11,9 @@ SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17" SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" do_install() { - oe_runmake install DESTDIR=${D} + oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d } RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)" -FILES_${PN} += "${base_libdir}/udev/rules.d/ \ +FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ \ ${datadir}/usb_modeswitch" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb index baad340908..6a5287af49 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb @@ -19,7 +19,7 @@ RDEPENDS_${PN} = "tcl" RRECOMMENDS_${PN} = "usb-modeswitch-data" do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb deleted file mode 100644 index 35dc4953bb..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.14.bb +++ /dev/null @@ -1,82 +0,0 @@ -SUMMARY = "VirtualBox Linux Guest Drivers" -SECTION = "core" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" - -DEPENDS = "virtual/kernel" - -inherit module kernel-module-split - -COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" - -VBOX_NAME = "VirtualBox-${PV}" - -SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ - file://Makefile.utils \ -" -SRC_URI[md5sum] = "6e4313df24fd00b0dc0437c3746b940d" -SRC_URI[sha256sum] = "91fa05bcfce36316ca93e3927c9550ea66286fff4c5bec900b753fca278ce1a0" - -S ?= "${WORKDIR}/vbox_module" -S_task-patch = "${WORKDIR}/${VBOX_NAME}" - -export BUILD_TARGET_ARCH="${ARCH}" -export BUILD_TARGET_ARCH_x86-64="amd64" - -EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" - -# otherwise 5.2.22 builds just vboxguest -MAKE_TARGETS = "all" - -addtask export_sources after do_patch before do_configure - -do_export_sources() { - mkdir -p "${S}" - ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz - tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz - - # add a mount utility to use shared folder from VBox Addition Source Code - mkdir -p "${S}/utils" - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils - install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils - install ${S}/../Makefile.utils ${S}/utils/Makefile - -} - -do_configure_prepend() { - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. - # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. - mkdir -p ${WORKDIR}/${KERNEL_VERSION} - ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build -} - -# compile and install mount utility -do_compile() { - oe_runmake all - oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils - if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then - echo "ERROR: One of vbox*.ko modules wasn't built" - exit 1 - fi -} - -module_do_install() { - MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc - install -d $MODULE_DIR - install -m 644 vboxguest.ko $MODULE_DIR - install -m 644 vboxsf.ko $MODULE_DIR - install -m 644 vboxvideo.ko $MODULE_DIR -} - -do_install_append() { - install -d ${D}${base_sbindir} - install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} -} - -PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" -RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" - -FILES_${PN} = "${base_sbindir}" - -# autoload if installed -KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb new file mode 100644 index 0000000000..9282f663b4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.16.bb @@ -0,0 +1,82 @@ +SUMMARY = "VirtualBox Linux Guest Drivers" +SECTION = "core" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://${WORKDIR}/${VBOX_NAME}/COPYING;md5=e197d5641bb35b29d46ca8c4bf7f2660" + +DEPENDS = "virtual/kernel" + +inherit module kernel-module-split + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" + +VBOX_NAME = "VirtualBox-${PV}" + +SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ + file://Makefile.utils \ +" +SRC_URI[md5sum] = "a12a647f6c114f2cb1571089b36841fe" +SRC_URI[sha256sum] = "49c1990da16d8a3d5bda8cdb961ec8195a901e67e4c79aea44c1521a5fc2f9f1" + +S ?= "${WORKDIR}/vbox_module" +S_task-patch = "${WORKDIR}/${VBOX_NAME}" + +export BUILD_TARGET_ARCH="${ARCH}" +export BUILD_TARGET_ARCH_x86-64="amd64" + +EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1" + +# otherwise 5.2.22 builds just vboxguest +MAKE_TARGETS = "all" + +addtask export_sources after do_patch before do_configure + +do_export_sources() { + mkdir -p "${S}" + ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/export_modules.sh ${T}/vbox_modules.tar.gz + tar -C "${S}" -xzf ${T}/vbox_modules.tar.gz + + # add a mount utility to use shared folder from VBox Addition Source Code + mkdir -p "${S}/utils" + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c ${S}/utils + install ${WORKDIR}/${VBOX_NAME}/src/VBox/Additions/linux/sharedfolders/vbsfmount.c ${S}/utils + install ${S}/../Makefile.utils ${S}/utils/Makefile + +} + +do_configure_prepend() { + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:99: *** The variable KERN_DIR must be a kernel build folder and end with /build without a trailing slash, or KERN_VER must be set. Stop. + # vboxguestdrivers/5.2.6-r0/vbox_module/vboxguest/Makefile.include.header:108: *** The kernel build folder path must end in /build, or the variable KERN_VER must be set. Stop. + mkdir -p ${WORKDIR}/${KERNEL_VERSION} + ln -snf ${STAGING_KERNEL_DIR} ${WORKDIR}/${KERNEL_VERSION}/build +} + +# compile and install mount utility +do_compile() { + oe_runmake all + oe_runmake 'LD=${CC}' 'LDFLAGS=${LDFLAGS}' -C ${S}/utils + if ! [ -e vboxguest.ko -a -e vboxsf.ko -a -e vboxvideo.ko ] ; then + echo "ERROR: One of vbox*.ko modules wasn't built" + exit 1 + fi +} + +module_do_install() { + MODULE_DIR=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/misc + install -d $MODULE_DIR + install -m 644 vboxguest.ko $MODULE_DIR + install -m 644 vboxsf.ko $MODULE_DIR + install -m 644 vboxvideo.ko $MODULE_DIR +} + +do_install_append() { + install -d ${D}${base_sbindir} + install -m 755 ${S}/utils/mount.vboxsf ${D}${base_sbindir} +} + +PACKAGES += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" +RRECOMMENDS_${PN} += "kernel-module-vboxguest kernel-module-vboxsf kernel-module-vboxvideo" + +FILES_${PN} = "${base_sbindir}" + +# autoload if installed +KERNEL_MODULE_AUTOLOAD += "vboxguest vboxsf vboxvideo" -- cgit v1.2.3