Patchwork [v2] systemd: added python-systemd package generation.

login
register
mail settings
Submitter Yevhen Kyriukha
Date April 5, 2013, 10:38 p.m.
Message ID <1365201484-3514-1-git-send-email-kirgene@gmail.com>
Download mbox | patch
Permalink /patch/47551/
State New
Headers show

Comments

Yevhen Kyriukha - April 5, 2013, 10:38 p.m.
---
 meta/recipes-core/systemd/systemd_199.bb |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
Koen Kooi - April 6, 2013, 10:24 a.m.
Op 6 apr. 2013, om 00:38 heeft Yevhen Kyriukha <kirgene@gmail.com> het volgende geschreven:

> ---
> meta/recipes-core/systemd/systemd_199.bb |   20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
> index e574548..00daf99 100644
> --- a/meta/recipes-core/systemd/systemd_199.bb
> +++ b/meta/recipes-core/systemd/systemd_199.bb
> @@ -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-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"

Do libtool archives belong in -staticdev?


> +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
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Yevhen Kyriukha - April 6, 2013, 10:31 a.m.
2013/4/6 Koen Kooi <koen@dominion.thruhere.net>:
>
> Op 6 apr. 2013, om 00:38 heeft Yevhen Kyriukha <kirgene@gmail.com> het volgende geschreven:
>
>> ---
>> meta/recipes-core/systemd/systemd_199.bb |   20 ++++++++++++++++----
>> 1 file changed, 16 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
>> index e574548..00daf99 100644
>> --- a/meta/recipes-core/systemd/systemd_199.bb
>> +++ b/meta/recipes-core/systemd/systemd_199.bb
>> @@ -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-python ?
>
I use
>> +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).*"
>>
>> -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"
>
> Do libtool archives belong in -staticdev?
>
>
>> +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
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Best regards,
Yevhen
Saul Wold - April 22, 2013, 5:36 p.m.
On 04/06/2013 03:24 AM, Koen Kooi wrote:
>
> Op 6 apr. 2013, om 00:38 heeft Yevhen Kyriukha <kirgene@gmail.com> het volgende geschreven:
>
>> ---
>> meta/recipes-core/systemd/systemd_199.bb |   20 ++++++++++++++++----
>> 1 file changed, 16 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
>> index e574548..00daf99 100644
>> --- a/meta/recipes-core/systemd/systemd_199.bb
>> +++ b/meta/recipes-core/systemd/systemd_199.bb
>> @@ -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-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"
>
> 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!

>
>> +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
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
index e574548..00daf99 100644
--- a/meta/recipes-core/systemd/systemd_199.bb
+++ b/meta/recipes-core/systemd/systemd_199.bb
@@ -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 \