Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[packages] Remove libselinux from packages_in_tools. JB#49710
Busybox needs libselinux already in sb2-tools so let's remove duplicate
library from here. Here is sb2-tools commit:
https://git.sailfishos.org/mer-crosshelpers/sb2-tools-template/commit/ca63b3d9e66a67b43b514dd7df3057a8818b8539

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  • Loading branch information
mkosola committed May 13, 2020
1 parent bd55266 commit b37d2c9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
3 changes: 1 addition & 2 deletions rpm/sb2-tools-qt5-aarch64.spec
Expand Up @@ -3,12 +3,11 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
# systemd: needed by uic from qt5-tools
# cryptsetup-libs: needed by uic from qt5-tools
# device-mapper-libs: needed by cryptsetup-libs
# json-c: needed by cryptsetup-libs
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error
Name: sb2-tools-qt5-aarch64
Version: 1.0
Release: 1
Expand Down
3 changes: 1 addition & 2 deletions rpm/sb2-tools-qt5-armv7hl.spec
Expand Up @@ -3,12 +3,11 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
# systemd: needed by uic from qt5-tools
# cryptsetup-libs: needed by uic from qt5-tools
# device-mapper-libs: needed by cryptsetup-libs
# json-c: needed by cryptsetup-libs
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error
Name: sb2-tools-qt5-armv7hl
Version: 1.0
Release: 1
Expand Down
3 changes: 1 addition & 2 deletions rpm/sb2-tools-qt5-armv7l.spec
Expand Up @@ -3,12 +3,11 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
# systemd: needed by uic from qt5-tools
# cryptsetup-libs: needed by uic from qt5-tools
# device-mapper-libs: needed by cryptsetup-libs
# json-c: needed by cryptsetup-libs
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error
Name: sb2-tools-qt5-armv7l
Version: 1.0
Release: 1
Expand Down
3 changes: 1 addition & 2 deletions rpm/sb2-tools-qt5-mipsel.spec
Expand Up @@ -3,12 +3,11 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
# systemd: needed by uic from qt5-tools
# cryptsetup-libs: needed by uic from qt5-tools
# device-mapper-libs: needed by cryptsetup-libs
# json-c: needed by cryptsetup-libs
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error
Name: sb2-tools-qt5-mipsel
Version: 1.0
Release: 1
Expand Down
3 changes: 1 addition & 2 deletions rpm/sb2-tools-qt5-template.spec
Expand Up @@ -3,12 +3,11 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
# systemd: needed by uic from qt5-tools
# cryptsetup-libs: needed by uic from qt5-tools
# device-mapper-libs: needed by cryptsetup-libs
# json-c: needed by cryptsetup-libs
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
%define packages_in_tools cryptsetup-libs device-mapper-libs json-c qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error
Name: sb2-tools-qt5-@ARCH@
Version: 1.0
Release: 1
Expand Down

0 comments on commit b37d2c9

Please sign in to comment.