Skip to contentSkip to conversation

systemd: added python-systemd package generation.

PATCH Superseded Yevhen Kyriukha 3 participants 4 messages Apr 5, 2013 – Apr 22, 2013

v2 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 systemd: added python-systemd package generation.

---
 meta/recipes-core/systemd/systemd_199.bb |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-core/systemd/systemd_199.bb +16 -4
index e574548..00daf99 100644
@@ -15,7 +15,13 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SECTION = "base/shell"
 
-inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d
+inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d pythonnative python-dir
+
+# need to export these variables for python-config to work
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
 
 SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://touchscreen.rules \
@@ -44,11 +50,13 @@ LDFLAGS_libc-uclibc_append = " -lrt"
 
 GTKDOC_DOCDIR = "${S}/docs/"
 
-PACKAGECONFIG ??= "xz"
+PACKAGECONFIG ??= "xz python"
 # Sign the journal for anti-tampering
 PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
 # Compress the journal
 PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
+# Use python-systemd
+PACKAGECONFIG[python] = "--with-python,--without-python,python"
 
 CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
 
@@ -65,7 +73,6 @@ EXTRA_OECONF = " --with-rootprefix=${base_prefix} \
                  --disable-tcpwrap \
                  --enable-split-usr \
                  --disable-microhttpd \
-                 --without-python \
                  --with-sysvrcnd-path=${sysconfdir} \
                  ac_cv_path_KILL=${base_bindir}/kill \
                "
@@ -114,7 +121,7 @@ python populate_packages_prepend (){
 }
 PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
 
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install python-${PN} python-${PN}-dbg python-${PN}-staticdev"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"
@@ -124,6 +131,11 @@ FILES_${PN}-analyze = "${base_bindir}/systemd-analyze"
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
+FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.py* ${PYTHON_SITEPACKAGES_DIR}/systemd/*.so"
+RDEPENDS_python-${PN} = "python-core python-datetime python-logging python-syslog"
+FILES_python-${PN}-staticdev = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.la"
+FILES_python-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/systemd/.debug"
+
 FILES_${PN}-gui = "${bindir}/systemadm"
 
 FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \
Signature · 1 line
1.7.9.5
#1 lore raw

Op 6 apr. 2013, om 00:38 heeft Yevhen Kyriukha <[email protected]> het volgende geschreven:

Quoted 39 lines

---
meta/recipes-core/systemd/systemd_199.bb | 20 ++++++++++++++++----

1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-core/systemd/systemd_199.bb +0 -0
index e574548..00daf99 100644
@@ -15,7 +15,13 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 

SECTION = "base/shell"

meta/recipes-core/systemd/systemd_199.bb +7 -1
-inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d
+inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d pythonnative python-dir
+
+# need to export these variables for python-config to work
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
           file://touchscreen.rules \
meta/recipes-core/systemd/systemd_199.bb +0 -0
@@ -44,11 +50,13 @@ LDFLAGS_libc-uclibc_append = " -lrt"
 

GTKDOC_DOCDIR = "${S}/docs/"

meta/recipes-core/systemd/systemd_199.bb +1 -1
-PACKAGECONFIG ??= "xz"
+PACKAGECONFIG ??= "xz python"

# Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" # Compress the journal
PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"

meta/recipes-core/systemd/systemd_199.bb +2 -0
+# Use python-systemd
+PACKAGECONFIG[python] = "--with-python,--without-python,python"

CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"

meta/recipes-core/systemd/systemd_199.bb EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ · line 68

Quoted 4 lines
meta/recipes-core/systemd/systemd_199.bb +0 -1
@@ -65,7 +73,6 @@ EXTRA_OECONF = " --with-rootprefix=${base_prefix} \
                 --disable-tcpwrap \
                 --enable-split-usr \
                 --disable-microhttpd \
-                 --without-python \

--with-python ?

Quoted 16 lines
meta/recipes-core/systemd/systemd_199.bb +0 -0
                 --with-sysvrcnd-path=${sysconfdir} \
                 ac_cv_path_KILL=${base_bindir}/kill \
               "
@@ -114,7 +121,7 @@ python populate_packages_prepend (){
 }

PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"

meta/recipes-core/systemd/systemd_199.bb +1 -1
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install python-${PN} python-${PN}-dbg python-${PN}-staticdev"

USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"

meta/recipes-core/systemd/systemd_199.bb +0 -0
@@ -124,6 +131,11 @@ FILES_${PN}-analyze = "${base_bindir}/systemd-analyze"

FILES_${PN}-initramfs = "/init"
RDEPENDS_${PN}-initramfs = "${PN}"

meta/recipes-core/systemd/systemd_199.bb FILES_${PN}-analyze = "${base_bindir}/systemd-analyze" · line 136

Quoted 3 lines
meta/recipes-core/systemd/systemd_199.bb +3 -0
+FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.py* ${PYTHON_SITEPACKAGES_DIR}/systemd/*.so"
+RDEPENDS_python-${PN} = "python-core python-datetime python-logging python-syslog"
+FILES_python-${PN}-staticdev = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.la"

Do libtool archives belong in -staticdev?

Quoted 13 lines
meta/recipes-core/systemd/systemd_199.bb +2 -0
+FILES_python-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/systemd/.debug"
+

FILES_${PN}-gui = "${bindir}/systemadm"

FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \

Signature · 7 lines
1.7.9.5


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
#2 lore raw

2013/4/6 Koen Kooi <[email protected]>:

Quoted 41 lines

Op 6 apr. 2013, om 00:38 heeft Yevhen Kyriukha <[email protected]> het volgende geschreven:

Quoted 38 lines

---
meta/recipes-core/systemd/systemd_199.bb | 20 ++++++++++++++++----

1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-core/systemd/systemd_199.bb +0 -0
index e574548..00daf99 100644
@@ -15,7 +15,13 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 

SECTION = "base/shell"

meta/recipes-core/systemd/systemd_199.bb +7 -1
-inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d
+inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d pythonnative python-dir
+
+# need to export these variables for python-config to work
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
           file://touchscreen.rules \
meta/recipes-core/systemd/systemd_199.bb +0 -0
@@ -44,11 +50,13 @@ LDFLAGS_libc-uclibc_append = " -lrt"
 

GTKDOC_DOCDIR = "${S}/docs/"

meta/recipes-core/systemd/systemd_199.bb +1 -1
-PACKAGECONFIG ??= "xz"
+PACKAGECONFIG ??= "xz python"

# Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" # Compress the journal
PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"

meta/recipes-core/systemd/systemd_199.bb +2 -0
+# Use python-systemd
+PACKAGECONFIG[python] = "--with-python,--without-python,python"

CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"

Quoted 8 lines

meta/recipes-core/systemd/systemd_199.bb EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ · line 68

Quoted 5 lines
meta/recipes-core/systemd/systemd_199.bb +0 -1
@@ -65,7 +73,6 @@ EXTRA_OECONF = " --with-rootprefix=${base_prefix} \
                 --disable-tcpwrap \
                 --enable-split-usr \
                 --disable-microhttpd \
-                 --without-python \

--with-python ?

I use

Quoted 34 lines
Quoted 18 lines
meta/recipes-core/systemd/systemd_199.bb +1 -0
+PACKAGECONFIG[python] = "--with-python,--without-python,python"
 
                 --with-sysvrcnd-path=${sysconfdir} \
                 ac_cv_path_KILL=${base_bindir}/kill \
               "
@@ -114,7 +121,7 @@ python populate_packages_prepend (){
 }

PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"

meta/recipes-core/systemd/systemd_199.bb +1 -1
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install python-${PN} python-${PN}-dbg python-${PN}-staticdev"

USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"

meta/recipes-core/systemd/systemd_199.bb +0 -0
@@ -124,6 +131,11 @@ FILES_${PN}-analyze = "${base_bindir}/systemd-analyze"

FILES_${PN}-initramfs = "/init"
RDEPENDS_${PN}-initramfs = "${PN}"

meta/recipes-core/systemd/systemd_199.bb FILES_${PN}-analyze = "${base_bindir}/systemd-analyze" · line 136

Quoted 3 lines
meta/recipes-core/systemd/systemd_199.bb +3 -0
+FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.py* ${PYTHON_SITEPACKAGES_DIR}/systemd/*.so"
+RDEPENDS_python-${PN} = "python-core python-datetime python-logging python-syslog"
+FILES_python-${PN}-staticdev = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.la"

Do libtool archives belong in -staticdev?

Quoted 9 lines
meta/recipes-core/systemd/systemd_199.bb +2 -0
+FILES_python-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/systemd/.debug"
+

FILES_${PN}-gui = "${bindir}/systemadm"

FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \
--
1.7.9.5

Quoted 5 lines
Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Best regards,
Yevhen

#3 lore raw
In reply to Koen Kooi
Quoted 65 lines · Koen Kooi

Op 6 apr. 2013, om 00:38 heeft Yevhen Kyriukha <[email protected]> het volgende geschreven:

Quoted 39 lines

---
meta/recipes-core/systemd/systemd_199.bb | 20 ++++++++++++++++----

1 file changed, 16 insertions(+), 4 deletions(-)
meta/recipes-core/systemd/systemd_199.bb +0 -0
index e574548..00daf99 100644
@@ -15,7 +15,13 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 

SECTION = "base/shell"

meta/recipes-core/systemd/systemd_199.bb +7 -1
-inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d
+inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d pythonnative python-dir
+
+# need to export these variables for python-config to work
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://touchscreen.rules \
meta/recipes-core/systemd/systemd_199.bb +0 -0
@@ -44,11 +50,13 @@ LDFLAGS_libc-uclibc_append = " -lrt"
 

GTKDOC_DOCDIR = "${S}/docs/"

meta/recipes-core/systemd/systemd_199.bb +1 -1
-PACKAGECONFIG ??= "xz"
+PACKAGECONFIG ??= "xz python"

# Sign the journal for anti-tampering PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" # Compress the journal
PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"

meta/recipes-core/systemd/systemd_199.bb +2 -0
+# Use python-systemd
+PACKAGECONFIG[python] = "--with-python,--without-python,python"

CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"

meta/recipes-core/systemd/systemd_199.bb EXTRA_OECONF = " --with-rootprefix=${base_prefix} \ · line 68

Quoted 4 lines
meta/recipes-core/systemd/systemd_199.bb +0 -1
@@ -65,7 +73,6 @@ EXTRA_OECONF = " --with-rootprefix=${base_prefix} \
                  --disable-tcpwrap \
                  --enable-split-usr \
                  --disable-microhttpd \
-                 --without-python \

--with-python ?

Quoted 16 lines
meta/recipes-core/systemd/systemd_199.bb +0 -0
                  --with-sysvrcnd-path=${sysconfdir} \
                  ac_cv_path_KILL=${base_bindir}/kill \
                "
@@ -114,7 +121,7 @@ python populate_packages_prepend (){
 }

PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"

meta/recipes-core/systemd/systemd_199.bb +1 -1
-PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install"
+PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install python-${PN} python-${PN}-dbg python-${PN}-staticdev"

USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"

meta/recipes-core/systemd/systemd_199.bb +0 -0
@@ -124,6 +131,11 @@ FILES_${PN}-analyze = "${base_bindir}/systemd-analyze"

FILES_${PN}-initramfs = "/init"
RDEPENDS_${PN}-initramfs = "${PN}"

Quoted 6 lines

meta/recipes-core/systemd/systemd_199.bb FILES_${PN}-analyze = "${base_bindir}/systemd-analyze" · line 136

Quoted 3 lines
meta/recipes-core/systemd/systemd_199.bb +3 -0
+FILES_python-${PN} = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.py* ${PYTHON_SITEPACKAGES_DIR}/systemd/*.so"
+RDEPENDS_python-${PN} = "python-core python-datetime python-logging python-syslog"
+FILES_python-${PN}-staticdev = "${PYTHON_SITEPACKAGES_DIR}/systemd/*.la"

Do libtool archives belong in -staticdev?

Koen is correct here, the .la files do not belong in -staticdev, but in the -dev package, please fix this.

Thanks
Sau!

Quoted 21 lines
Quoted 10 lines
meta/recipes-core/systemd/systemd_199.bb +2 -0
+FILES_python-${PN}-dbg = "${PYTHON_SITEPACKAGES_DIR}/systemd/.debug"
+

FILES_${PN}-gui = "${bindir}/systemadm"

FILES_${PN}-vconsole-setup = "${systemd_unitdir}/systemd-vconsole-setup \
--
1.7.9.5

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core