summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-02-25 19:05:53 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-02-25 19:06:31 +0100
commit68cb4ce3f7fb86d7f70bdfa9b596eae19aa02a61 (patch)
tree12b54490d77de0978caa17c298d47496091ee69e
parent1c56b8cc5af0bae3410e406fa62e643765662ae2 (diff)
downloadtde-packaging-68cb4ce3f7fb86d7f70bdfa9b596eae19aa02a61.tar.gz
tde-packaging-68cb4ce3f7fb86d7f70bdfa9b596eae19aa02a61.zip
DEB: Make sure that python binary exists for packages that still depend on python2.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 94d173946594dc70145f855204f412314d5c02f2)
-rwxr-xr-xdebian/_base/applications/fusion-icon/debian/rules6
-rwxr-xr-xdebian/_base/applications/tde-guidance/debian/rules6
-rwxr-xr-xdebian/_base/libraries/pytdeextensions/debian/rules6
-rwxr-xr-xubuntu/_base/applications/fusion-icon/debian/rules6
-rwxr-xr-xubuntu/_base/applications/tde-guidance/debian/rules6
-rwxr-xr-xubuntu/_base/libraries/pytdeextensions/debian/rules6
6 files changed, 36 insertions, 0 deletions
diff --git a/debian/_base/applications/fusion-icon/debian/rules b/debian/_base/applications/fusion-icon/debian/rules
index 4f2025eca..46359aca2 100755
--- a/debian/_base/applications/fusion-icon/debian/rules
+++ b/debian/_base/applications/fusion-icon/debian/rules
@@ -15,6 +15,12 @@ endif
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+post-patches::
+ # make sure that python binary exists
+ # since the existing code is still dependent on python2
+ # and cdbs uses python as the default binary name
+ test -x /usr/bin/python || ln -s python2 /usr/bin/python
+
binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/usr/local/lib
cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
diff --git a/debian/_base/applications/tde-guidance/debian/rules b/debian/_base/applications/tde-guidance/debian/rules
index b4a195a5c..0cbf1123b 100755
--- a/debian/_base/applications/tde-guidance/debian/rules
+++ b/debian/_base/applications/tde-guidance/debian/rules
@@ -25,6 +25,12 @@ LDFLAGS_APPEND := -L/opt/trinity/lib
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+post-patches::
+ # make sure that python binary exists
+ # since the existing code is still dependent on python2
+ # and cdbs uses python as the default binary name
+ test -x /usr/bin/python || ln -s python2 /usr/bin/python
+
install/tde-guidance-trinity::
# install icons to right place
install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \
diff --git a/debian/_base/libraries/pytdeextensions/debian/rules b/debian/_base/libraries/pytdeextensions/debian/rules
index e4c433701..28a7627ba 100755
--- a/debian/_base/libraries/pytdeextensions/debian/rules
+++ b/debian/_base/libraries/pytdeextensions/debian/rules
@@ -29,6 +29,12 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+post-patches::
+ # make sure that python binary exists
+ # since the existing code is still dependent on python2
+ # and cdbs uses python as the default binary name
+ test -x /usr/bin/python || ln -s python2 /usr/bin/python
+
install/pytdeextensions-trinity::
# We have no idea if the built product is site-packages or dist-packages
cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages"
diff --git a/ubuntu/_base/applications/fusion-icon/debian/rules b/ubuntu/_base/applications/fusion-icon/debian/rules
index 4f2025eca..46359aca2 100755
--- a/ubuntu/_base/applications/fusion-icon/debian/rules
+++ b/ubuntu/_base/applications/fusion-icon/debian/rules
@@ -15,6 +15,12 @@ endif
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+post-patches::
+ # make sure that python binary exists
+ # since the existing code is still dependent on python2
+ # and cdbs uses python as the default binary name
+ test -x /usr/bin/python || ln -s python2 /usr/bin/python
+
binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/usr/local/lib
cp -Rp debian/fusion-icon-trinity/usr/local/* debian/fusion-icon-trinity/usr/
diff --git a/ubuntu/_base/applications/tde-guidance/debian/rules b/ubuntu/_base/applications/tde-guidance/debian/rules
index b4a195a5c..0cbf1123b 100755
--- a/ubuntu/_base/applications/tde-guidance/debian/rules
+++ b/ubuntu/_base/applications/tde-guidance/debian/rules
@@ -25,6 +25,12 @@ LDFLAGS_APPEND := -L/opt/trinity/lib
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+post-patches::
+ # make sure that python binary exists
+ # since the existing code is still dependent on python2
+ # and cdbs uses python as the default binary name
+ test -x /usr/bin/python || ln -s python2 /usr/bin/python
+
install/tde-guidance-trinity::
# install icons to right place
install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \
diff --git a/ubuntu/_base/libraries/pytdeextensions/debian/rules b/ubuntu/_base/libraries/pytdeextensions/debian/rules
index e4c433701..28a7627ba 100755
--- a/ubuntu/_base/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/_base/libraries/pytdeextensions/debian/rules
@@ -29,6 +29,12 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinit
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+post-patches::
+ # make sure that python binary exists
+ # since the existing code is still dependent on python2
+ # and cdbs uses python as the default binary name
+ test -x /usr/bin/python || ln -s python2 /usr/bin/python
+
install/pytdeextensions-trinity::
# We have no idea if the built product is site-packages or dist-packages
cd debian/tmp/usr/lib/python*/ && mv site-packages/ dist-packages/ || echo "site-packages --> dist-packages"