[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Fixing udev-udeb vs. net.ifnames for Stretch Alpha 1



Cyril Brulebois <kibi@debian.org> (2015-07-16):
> Uploaded and accepted into tpu, thanks.

And binary builds are getting rejected due to the python3-systemd binary
which was split out of src:systemd, and has a higher version in testing
(230-1 >> 221-1+deb9u1).

I've therefore cherry-picked:
| commit 3eabc6e72657015863d77039dcb64ae62c2ef0b2
| Author: Michael Biebl <biebl@debian.org>
| Date:   Wed Jul 8 01:07:53 2015 +0200
| 
|     Stop building the Python 3 bindings
|     
|     They were split into a separate source package upstream and are now
|     built from src:python-systemd. See
|     http://lists.freedesktop.org/archives/systemd-devel/2015-July/033443.html
|     
|     We keep a Build-Depends on python3 which is required to build the
|     documentation.

I'm attaching the matching git format-patch and seeking a go from
systemd maintainers and release team for a new attempt at t-p-u…

(FWIW, mipsel and ppc64el lacked proper buildd foo to build stretch
packages; Kurt fixed that part, and reported back the REJECTs to me.)

Mraw,
KiBi.
From 64b82708273a480eca7ac17ca14a358faaa122c1 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 8 Jul 2015 01:07:53 +0200
Subject: [PATCH] Stop building the Python 3 bindings

They were split into a separate source package upstream and are now
built from src:python-systemd. See
http://lists.freedesktop.org/archives/systemd-devel/2015-July/033443.html

We keep a Build-Depends on python3 which is required to build the
documentation.

(cherry picked from commit 3eabc6e72657015863d77039dcb64ae62c2ef0b2)

Signed-off-by: Cyril Brulebois <kibi@debian.org>
---
 debian/changelog               | 13 +++++++++++++
 debian/control                 | 13 +------------
 debian/python3-systemd.install |  1 -
 debian/rules                   |  3 ++-
 debian/tests/control           |  3 ---
 debian/tests/python3           |  9 ---------
 6 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 debian/python3-systemd.install
 delete mode 100755 debian/tests/python3

diff --git a/debian/changelog b/debian/changelog
index 1feb3e0..43ce986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+systemd (221-1+deb9u2) stretch-proposed-updates; urgency=medium
+
+  [ Cyril Brulebois ]
+  * Additionally cherry-pick the following commit to avoid REJECTs since
+    stretch already has python3-systemd version 230-1.
+
+  [ Michael Biebl ]
+  * Stop building the Python 3 bindings. They were split into a separate
+    source package upstream and are now built from src:python-systemd. See
+    http://lists.freedesktop.org/archives/systemd-devel/2015-July/033443.html
+
+ -- Cyril Brulebois <kibi@debian.org>  Thu, 16 Jul 2015 20:56:18 +0200
+
 systemd (221-1+deb9u1) stretch-proposed-updates; urgency=medium
 
   [ Cyril Brulebois ]
diff --git a/debian/control b/debian/control
index 86a19f3..0bda9c9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Uploaders: Michael Biebl <biebl@debian.org>,
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-systemd/systemd.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-systemd/systemd.git
-X-Python3-Version: >= 3.1
 Homepage: http://www.freedesktop.org/wiki/Software/systemd
 Build-Depends: debhelper (>= 9),
                pkg-config,
@@ -37,7 +36,7 @@ Build-Depends: debhelper (>= 9),
                libblkid-dev (>= 2.24),
                libmount-dev (>= 2.20),
                libseccomp-dev (>= 1.0.0) [amd64 arm64 armel armhf i386 mips mipsel],
-               python3-all-dev,
+               python3,
                python3-lxml
 
 Package: systemd
@@ -338,16 +337,6 @@ Description: libudev shared library
  .
  This is a minimal version, only for use in the installation system.
 
-Package: python3-systemd
-Section: python
-Priority: optional
-Architecture: linux-any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python3:Depends}
-Description: Python 3 bindings for systemd
- This package contains Python 3 bindings for the systemd libraries.
-
 Package: systemd-dbg
 Architecture: linux-any
 Section: debug
diff --git a/debian/python3-systemd.install b/debian/python3-systemd.install
deleted file mode 100644
index ac58d1f..0000000
--- a/debian/python3-systemd.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python*/*-packages/systemd
diff --git a/debian/rules b/debian/rules
index 63b7767..d727557 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ CONFFLAGS = \
 	--disable-importd \
 	--disable-libiptc \
 	--disable-silent-rules \
+	--disable-python-devel \
 	--with-ntp-servers="$(DEFAULT_NTP_SERVERS)"  \
 	--with-system-uid-max=999 \
 	--with-system-gid-max=999
@@ -285,4 +286,4 @@ dh_options = -Nudev-udeb -Nlibudev1-udeb
 endif
 
 %:
-	dh $@ $(dh_options) --with autoreconf,python3 --parallel
+	dh $@ $(dh_options) --with autoreconf --parallel
diff --git a/debian/tests/control b/debian/tests/control
index 7ea349b..ccc1960 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -18,9 +18,6 @@ Tests: build-login
 Depends: libsystemd-dev, build-essential, pkg-config
 Restrictions: isolation-container
 
-Tests: python3
-Depends: python3-systemd
-
 Tests: boot-and-services
 Depends: systemd-sysv, lightdm, cron, network-manager, busybox-static, apparmor, python3
 Restrictions: needs-root, isolation-machine, needs-recommends, breaks-testbed
diff --git a/debian/tests/python3 b/debian/tests/python3
deleted file mode 100755
index 44c62e0..0000000
--- a/debian/tests/python3
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/python3
-
-import uuid
-import systemd.id128
-
-u = systemd.id128.randomize()
-
-assert isinstance(u, uuid.UUID)
-print('UUID:', u)
-- 
2.1.4

Attachment: signature.asc
Description: Digital signature


Reply to: