Re: [ptxdist] [PATCH] systemd: version bump 201

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Tue, Apr 16, 2013 at 09:33:15AM -0400, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
> 
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
>  rules/systemd.in   |  2 ++
>  rules/systemd.make | 12 ++++++------
>  rules/udev.make    |  5 +++--
>  3 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/systemd.in b/rules/systemd.in
> index a5d77e8..3a9427d 100644
> --- a/rules/systemd.in
> +++ b/rules/systemd.in
> @@ -17,10 +17,12 @@ menuconfig SYSTEMD
>  	select TCPWRAPPER	if SYSTEMD_TCPWRAP
>  	select XZ		if SYSTEMD_XZ
>  	select LIBSELINUX	if GLOBAL_SELINUX
> +	select ATTR
>  	# for udev:
>  	select ROOTFS_DEV
>  	select LIBKMOD
>  	select LIBBLKID
> +	select LIBGCRYPT

attr and gcrypt are both optional, so ist should be possible to disable
those.

>  	select GLIB		if UDEV_LIBGUDEV
>  	select PCIUTILS		if UDEV_PERSISTENT_PCI && RUNTIME
>  	select USBUTILS		if UDEV_PERSISTENT_USB && RUNTIME
> diff --git a/rules/systemd.make b/rules/systemd.make
> index 84ad633..34b0a94 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
>  #
>  # Paths and names
>  #
> -SYSTEMD_VERSION	:= 195
> -SYSTEMD_MD5	:= 38e8c8144e7e6e5bc3ce32eb4260e680
> +SYSTEMD_VERSION	:= 201
> +SYSTEMD_MD5	:= 3e758392ff0e9206b3f7ee252b4a654b

How stable does it feel? I've been waiting with an update, because usually
the first few releases after a Fedora release are a bit unstable.

>  SYSTEMD		:= systemd-$(SYSTEMD_VERSION)
>  SYSTEMD_SUFFIX	:= tar.xz
>  SYSTEMD_URL	:= http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)
> @@ -80,11 +80,11 @@ SYSTEMD_CONF_OPT := \
>  	--$(call ptx/endis,PTXCONF_UDEV_KEYMAPS)-keymap \
>  	--disable-manpages \
>  	--enable-split-usr \
> -	--with-usb-ids-path=/usr/share/usb.ids \
> -	--with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,) \
> -	--with-distro=other \
> +	--enable-kmod \
> +	--enable-blkid \

Hmm, these are optional now. I always use modules so I don't care about
making that optional, but making blkid optional might be interesting for
smaller NAND-only systems. But that can be done later.

>  	--with-sysvinit-path="" \
> -	--with-sysvrcd-path="" \
> +	--with-sysvrcnd-path="" \
> +	--$(call ptx/wwo,PTXCONF_DBUS_PYTHON)-python \

No. Don't use an option from a different package. I think a
SYSTEMD_PYTHON_BINDINGS option, or something like that is appropriate.

Also, you need to specify $(CROSS_PYTHON) here, or it will pick the wrong
python, and don't forget to change the ':=' to '=' at the beginning.

But then you need to actually install the stuff. If you don't care about
that, then just disable it.
Also, in v195 python was needed at runtime for systemd-analyze. This is now
a C-Program, so that dependency must be removed.


>  	--with-dbuspolicydir=/etc/dbus-1/system.d \
>  	--with-dbussessionservicedir=/usr/share/dbus-1/services \
>  	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> diff --git a/rules/udev.make b/rules/udev.make
> index 80c703f..66f1081 100644
> --- a/rules/udev.make
> +++ b/rules/udev.make
> @@ -107,7 +107,8 @@ UDEV_RULES-y += \
>  	70-power-switch.rules \
>  	70-uaccess.rules \
>  	71-seat.rules \
> -	73-seat-late.rules
> +	73-seat-late.rules \
> +	80-net-name-slot.rules
>  
>  endif
>  
> @@ -180,7 +181,7 @@ ifdef PTXCONF_UDEV_LEGACY
>  else
>  ifdef PTXCONF_SYSTEMD
>  	@$(call install_copy, udev, 0, 0, 0755, -, /lib/systemd/systemd-udevd)
> -	@$(call install_copy, udev, 0, 0, 0755, -, /usr/bin/udevadm)
> +	@$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm)
>  else
>  	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/udevd)
>  	@$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm)

No other new libraries/programs?

Michael

> -- 
> 1.7.12.1.2.g0f9f35a
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de