Skip to content

Commit

Permalink
[packages] Add systemd to packages_in_tools, needed by qt5-tools. JB#…
Browse files Browse the repository at this point in the history
…49710

Signed-off-by: Matti Kosola <matti.kosola@jolla.com>
  • Loading branch information
mkosola committed May 5, 2020
1 parent 3d85944 commit ed060d5
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
5 changes: 4 additions & 1 deletion rpm/sb2-tools-qt5-aarch64.spec
Expand Up @@ -4,7 +4,8 @@
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error libselinux
# systemd: needed by uic from qt5-tools
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
Name: sb2-tools-qt5-aarch64
Version: 1.0
Release: 1
Expand Down Expand Up @@ -47,8 +48,10 @@ It is not intended to be used in a normal system!
mkdir -p %buildroot
rpm -ql %packages_in_tools > filestoinclude1
cat > filestoignore << EOF
/etc/crypttab
/usr/share/man
/usr/share/doc
/var/lib/systemd/random-seed
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
cat filestoinclude2
Expand Down
5 changes: 4 additions & 1 deletion rpm/sb2-tools-qt5-armv7hl.spec
Expand Up @@ -4,7 +4,8 @@
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error libselinux
# systemd: needed by uic from qt5-tools
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
Name: sb2-tools-qt5-armv7hl
Version: 1.0
Release: 1
Expand Down Expand Up @@ -47,8 +48,10 @@ It is not intended to be used in a normal system!
mkdir -p %buildroot
rpm -ql %packages_in_tools > filestoinclude1
cat > filestoignore << EOF
/etc/crypttab
/usr/share/man
/usr/share/doc
/var/lib/systemd/random-seed
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
cat filestoinclude2
Expand Down
5 changes: 4 additions & 1 deletion rpm/sb2-tools-qt5-armv7l.spec
Expand Up @@ -4,7 +4,8 @@
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error libselinux
# systemd: needed by uic from qt5-tools
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
Name: sb2-tools-qt5-armv7l
Version: 1.0
Release: 1
Expand Down Expand Up @@ -47,8 +48,10 @@ It is not intended to be used in a normal system!
mkdir -p %buildroot
rpm -ql %packages_in_tools > filestoinclude1
cat > filestoignore << EOF
/etc/crypttab
/usr/share/man
/usr/share/doc
/var/lib/systemd/random-seed
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
cat filestoinclude2
Expand Down
5 changes: 4 additions & 1 deletion rpm/sb2-tools-qt5-mipsel.spec
Expand Up @@ -4,7 +4,8 @@
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error libselinux
# systemd: needed by uic from qt5-tools
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
Name: sb2-tools-qt5-mipsel
Version: 1.0
Release: 1
Expand Down Expand Up @@ -47,8 +48,10 @@ It is not intended to be used in a normal system!
mkdir -p %buildroot
rpm -ql %packages_in_tools > filestoinclude1
cat > filestoignore << EOF
/etc/crypttab
/usr/share/man
/usr/share/doc
/var/lib/systemd/random-seed
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
cat filestoinclude2
Expand Down
5 changes: 4 additions & 1 deletion rpm/sb2-tools-qt5-template.spec
Expand Up @@ -4,7 +4,8 @@
# qt5-qtcore: needed by uic from qt5-tools
# systemd-libs libgcrypt libgpg-error: needed by qt5-qtcore
# libselinux: needed by systemd-libs
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd-libs libgcrypt libgpg-error libselinux
# systemd: needed by uic from qt5-tools
%define packages_in_tools qt5-qmake qt5-tools qt5-qtcore qt5-qtxml systemd systemd-libs libgcrypt libgpg-error libselinux
Name: sb2-tools-qt5-@ARCH@
Version: 1.0
Release: 1
Expand Down Expand Up @@ -47,8 +48,10 @@ It is not intended to be used in a normal system!
mkdir -p %buildroot
rpm -ql %packages_in_tools > filestoinclude1
cat > filestoignore << EOF
/etc/crypttab
/usr/share/man
/usr/share/doc
/var/lib/systemd/random-seed
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
cat filestoinclude2
Expand Down

0 comments on commit ed060d5

Please sign in to comment.