Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[deps] Add libnghttp2 for libcurl. JB#50106
Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  • Loading branch information
mkosola committed Jun 16, 2020
1 parent 764b90e commit f6ade14
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 18 deletions.
4 changes: 2 additions & 2 deletions sb2-tools-aarch64.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-aarch64-gcc cross-aarch64-binutils
%define _target_cpu aarch64
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-aarch64-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
4 changes: 2 additions & 2 deletions sb2-tools-armv6l.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-armv6l-gcc cross-armv6l-binutils
%define _target_cpu armv6l
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-armv6l-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
4 changes: 2 additions & 2 deletions sb2-tools-armv7hl.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-armv7hl-gcc cross-armv7hl-binutils
%define _target_cpu armv7hl
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-armv7hl-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
4 changes: 2 additions & 2 deletions sb2-tools-armv7l.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-armv7l-gcc cross-armv7l-binutils
%define _target_cpu armv7l
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-armv7l-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
4 changes: 2 additions & 2 deletions sb2-tools-armv7thl.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-armv7thl-gcc cross-armv7thl-binutils
%define _target_cpu armv7thl
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-armv7thl-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
4 changes: 2 additions & 2 deletions sb2-tools-armv7tnhl.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-armv7tnhl-gcc cross-armv7tnhl-binutils
%define _target_cpu armv7tnhl
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-armv7tnhl-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
4 changes: 2 additions & 2 deletions sb2-tools-i486.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-i486-gcc cross-i486-binutils
%define _target_cpu i486
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-i486-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
4 changes: 2 additions & 2 deletions sb2-tools-mipsel.spec
@@ -1,14 +1,14 @@
# busybox is included because busybox-symlinks-which needs it
# busybox-symlinks-which provides which
# libselinux is needed by busybox
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define packages_in_tools autoconf automake bash binutils busybox busybox-symlinks-which bzip2 bzip2-libs ccache cmake cpio cpp db4 diffutils doxygen elfutils elfutils-libelf elfutils-libs expat fakeroot fdupes file file-libs filesystem findutils fontconfig freetype gawk gcc glib2 glibc glibc-common glibc-devel glibc-headers gmp gnu-coreutils grep gzip kernel-headers libacl libarchive libattr libblkid libcap libcap libcurl libgcc libgomp libicu libidn liblua libmount libnghttp2 libpsl libsb2 libselinux libsmartcols libstdc++ libuuid libxml2 m4 make mpc mpfr ncurses-libs net-tools nspr nss nss-pem nss-softokn-freebl openssl-libs pam pcre perl perl-libs perl-Scalar-List-Utils perl-threads perl-threads-shared popt python3-base python3-libs python3-setuptools python3-rpm-generators qemu-usermode readline rpm rpm-build rpm-devel rpm-libs rpmlint-mini scratchbox2 sed setup sqlite-libs tar util-linux xz xz-libs zip zlib
%define cross_compilers cross-mipsel-gcc cross-mipsel-binutils
%define _target_cpu mipsel
# Prevent stripping, python-bytecompiling etc. as this has been already done for the packages
%global __os_install_post %{nil}

Name: sb2-tools-mipsel-inject
Version: 1.0+git13
Version: 1.0+git14
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
Expand Down
3 changes: 3 additions & 0 deletions sb2-tools-template.changes
@@ -1,3 +1,6 @@
* Tue Jun 16 2020 Matti Kosola <matti.kosola@jolla.com> - 1.0+git14
- Add libnghttp2 for libcurl. JB#50106

* Tue Apr 28 2020 Matti Kosola <matti.kosola@jolla.com> - 1.0+git13
- Add libpsl for libcurl. JB#49525

Expand Down

0 comments on commit f6ade14

Please sign in to comment.