Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-01-30 11:20:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-01-29 07:05:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-01-30 11:20:37.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Jan 29 13:32:30 UTC 2013 - [email protected] + +- udev: Fix device matching in the accelerometer + add: 1019-udev-Fix-device-matching-in-the-accelerometer.patch +- keymap: add aditional support for some keyboard keys + add: 1018-keymap-add-aditional-support.patch +- journalctl: require argument for --priority + add: journalctl-require-argument-for-priority +- dropped useless patches: + libudev-validate-argument-udev_enumerate_new.patch + kmod-fix-builtin-typo.patch +- rename udev-root-symlink.service to systemd-udev-root-symlink.service. +- fix in udev package missing link in basic.target.wants for + systemd-udev-root-symlink.service + +------------------------------------------------------------------- systemd.changes: same change Old: ---- kmod-fix-builtin-typo.patch libudev-validate-argument-udev_enumerate_new.patch udev-root-symlink.systemd New: ---- 1018-keymap-add-aditional-support.patch 1019-udev-Fix-device-matching-in-the-accelerometer.patch systemd-udev-root-symlink ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.K68NRt/_old 2013-01-30 11:20:40.000000000 +0100 +++ /var/tmp/diff_new_pack.K68NRt/_new 2013-01-30 11:20:40.000000000 +0100 @@ -106,7 +106,7 @@ Source1060: boot.udev Source1061: write_dev_root_rule -Source1062: udev-root-symlink.systemd +Source1062: systemd-udev-root-symlink Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings @@ -260,6 +260,8 @@ Patch123: tmpfiles-X-type.patch # PATCH-FIX-UPSTREAM systemd-fix-merge-ignore-dependencies.patch [email protected] bnc#800365 -- fix merging with --ignore-dependencies waiting for dependencies Patch124: systemd-fix-merge-ignore-dependencies.patch +# PATCH-FIX-UPSTREAM journalctl-require-argument-for-priority +Patch125: journalctl-require-argument-for-priority # udev patches # PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch @@ -296,6 +298,10 @@ Patch1016: 1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch # PATCH-FIX-UPSTREAM 1017-udev-use-usec_t-and-now.patch Patch1017: 1017-udev-use-usec_t-and-now.patch +# PATCH-FIX-UPSTREAM 1018-keymap-add-aditional-support.patch +Patch1018: 1018-keymap-add-aditional-support.patch +# PATCH-FIX-UPSTREAM 1019-udev-Fix-device-matching-in-the-accelerometer.patch +Patch1019: 1019-udev-Fix-device-matching-in-the-accelerometer.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -473,6 +479,8 @@ %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 +%patch1018 -p1 +%patch1019 -p1 #systemd %patch1 -p1 @@ -561,6 +569,7 @@ %patch122 -p1 %patch123 -p1 %patch124 -p1 +%patch125 -p1 %build autoreconf -fiv @@ -609,9 +618,9 @@ sed -ie "s|@@PREFIX@@|%{_bindir}|g" %{S:1061} install -m755 -D %{S:1061} $RPM_BUILD_ROOT/%{_prefix}/lib/udev/write_dev_root_rule sed -ie "s|@@PREFIX@@|%{_prefix}/lib/udev|g" %{S:1062} -install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev-root-symlink.service +install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants +ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze @@ -870,9 +879,9 @@ %dir %{_prefix}/lib/systemd/system %exclude %{_prefix}/lib/systemd/system/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/udev.service -%exclude %{_prefix}/lib/systemd/system/udev-root-symlink.service +%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/basic.target.wants/udev-root-symlink.service +%exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service %{_prefix}/lib/systemd/system/*.automount %{_prefix}/lib/systemd/system/*.service %{_prefix}/lib/systemd/system/*.target @@ -1074,7 +1083,8 @@ %endif %dir %{_prefix}/lib/systemd/system %{_prefix}/lib/systemd/systemd-udevd -%{_prefix}/lib/systemd/system/udev-root-symlink.service +%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service +%{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service %{_prefix}/lib/systemd/system/*udev*.service %{_prefix}/lib/systemd/system/systemd-udevd*.socket %dir %{_prefix}/lib/systemd/system/sysinit.target.wants ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.K68NRt/_old 2013-01-30 11:20:40.000000000 +0100 +++ /var/tmp/diff_new_pack.K68NRt/_new 2013-01-30 11:20:40.000000000 +0100 @@ -101,7 +101,7 @@ Source1060: boot.udev Source1061: write_dev_root_rule -Source1062: udev-root-symlink.systemd +Source1062: systemd-udev-root-symlink Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings @@ -255,6 +255,8 @@ Patch123: tmpfiles-X-type.patch # PATCH-FIX-UPSTREAM systemd-fix-merge-ignore-dependencies.patch [email protected] bnc#800365 -- fix merging with --ignore-dependencies waiting for dependencies Patch124: systemd-fix-merge-ignore-dependencies.patch +# PATCH-FIX-UPSTREAM journalctl-require-argument-for-priority +Patch125: journalctl-require-argument-for-priority # udev patches # PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch @@ -291,6 +293,10 @@ Patch1016: 1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch # PATCH-FIX-UPSTREAM 1017-udev-use-usec_t-and-now.patch Patch1017: 1017-udev-use-usec_t-and-now.patch +# PATCH-FIX-UPSTREAM 1018-keymap-add-aditional-support.patch +Patch1018: 1018-keymap-add-aditional-support.patch +# PATCH-FIX-UPSTREAM 1019-udev-Fix-device-matching-in-the-accelerometer.patch +Patch1019: 1019-udev-Fix-device-matching-in-the-accelerometer.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -468,6 +474,8 @@ %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 +%patch1018 -p1 +%patch1019 -p1 #systemd %patch1 -p1 @@ -556,6 +564,7 @@ %patch122 -p1 %patch123 -p1 %patch124 -p1 +%patch125 -p1 %build autoreconf -fiv @@ -604,9 +613,9 @@ sed -ie "s|@@PREFIX@@|%{_bindir}|g" %{S:1061} install -m755 -D %{S:1061} $RPM_BUILD_ROOT/%{_prefix}/lib/udev/write_dev_root_rule sed -ie "s|@@PREFIX@@|%{_prefix}/lib/udev|g" %{S:1062} -install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/udev-root-symlink.service +install -m644 -D %{S:1062} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants -ln -sf ../udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants +ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/system/basic.target.wants #workaround for 716939 chmod 644 %{buildroot}%{_bindir}/systemd-analyze @@ -865,9 +874,9 @@ %dir %{_prefix}/lib/systemd/system %exclude %{_prefix}/lib/systemd/system/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/udev.service -%exclude %{_prefix}/lib/systemd/system/udev-root-symlink.service +%exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/basic.target.wants/udev-root-symlink.service +%exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service %{_prefix}/lib/systemd/system/*.automount %{_prefix}/lib/systemd/system/*.service %{_prefix}/lib/systemd/system/*.target @@ -1069,7 +1078,8 @@ %endif %dir %{_prefix}/lib/systemd/system %{_prefix}/lib/systemd/systemd-udevd -%{_prefix}/lib/systemd/system/udev-root-symlink.service +%{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service +%{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service %{_prefix}/lib/systemd/system/*udev*.service %{_prefix}/lib/systemd/system/systemd-udevd*.socket %dir %{_prefix}/lib/systemd/system/sysinit.target.wants ++++++ 1018-keymap-add-aditional-support.patch ++++++ Index: systemd-195/Makefile.am =================================================================== --- systemd-195.orig/Makefile.am +++ systemd-195/Makefile.am @@ -2265,6 +2265,8 @@ dist_udevkeymap_DATA = \ keymaps/hewlett-packard-presario-2100 \ keymaps/hewlett-packard-tablet \ keymaps/hewlett-packard-tx2 \ + keymaps/hewlett-packard_elitebook-8440p \ + keymaps/hewlett-packard-hdx9494nr \ keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ keymaps/inventec-symphony_6.0_7.0 \ keymaps/lenovo-3000 \ Index: systemd-195/keymaps/hewlett-packard-hdx9494nr =================================================================== --- /dev/null +++ systemd-195/keymaps/hewlett-packard-hdx9494nr @@ -0,0 +1,3 @@ +0xB2 www # FnF3 +0xD8 f23 # touchpad off +0xD9 f22 # touchpad on Index: systemd-195/keymaps/hewlett-packard_elitebook-8440p =================================================================== --- /dev/null +++ systemd-195/keymaps/hewlett-packard_elitebook-8440p @@ -0,0 +1,5 @@ +0x88 www +0xA0 mute +0xAE volumedown +0xB0 volumeup +0xEC mail Index: systemd-195/src/udev/keymap/95-keyboard-force-release.rules =================================================================== --- systemd-195.orig/src/udev/keymap/95-keyboard-force-release.rules +++ systemd-195/src/udev/keymap/95-keyboard-force-release.rules @@ -42,7 +42,7 @@ ENV{DMI_VENDOR}=="Viooo Corporation", AT # These are all the HP laptops that setup a touchpad toggle key ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[pP][aA][vV][iI][lL][iI][oO][nN]*", RUN+="keyboard-force-release.sh $devpath hp-other" ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keyboard-force-release.sh $devpath hp-other" -ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC", RUN+="keyboard-force-release.sh $devpath hp-other" +ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC|HDX9494NR", RUN+="keyboard-force-release.sh $devpath hp-other" ENV{DMI_VENDOR}=="Zepto", ATTR{[dmi/id]product_name}=="Znote 6615WD", RUN+="keyboard-force-release.sh $devpath common-volume-keys" Index: systemd-195/src/udev/keymap/95-keymap.rules =================================================================== --- systemd-195.orig/src/udev/keymap/95-keymap.rules +++ systemd-195/src/udev/keymap/95-keymap.rules @@ -96,7 +96,9 @@ ENV{DMI_VENDOR}=="Hewlett-Packard*", ATT ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keymap $name hewlett-packard-tx2" ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="Presario 2100*", RUN+="keymap $name hewlett-packard-presario-2100" ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP G62 Notebook PC", RUN+="keymap $name 0xB2 www" -ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP ProBook*", RUN+="keymap $name 0xF8 rfkill" +ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP ProBook*", RUN+="keymap $name 0xF8 rfkill 0xB2 www" +ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP EliteBook 8440p", RUN+="keymap $name hewlett-packard_elitebook-8440p" +ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HDX9494NR", RUN+="keymap $name hewlett-packard-hdx9494nr" # HP Pavillion dv6315ea has empty DMI_VENDOR ATTR{[dmi/id]board_vendor}=="Quanta", ATTR{[dmi/id]board_name}=="30B7", ATTR{[dmi/id]board_version}=="65.2B", RUN+="keymap $name 0x88 media" # "quick play ++++++ 1019-udev-Fix-device-matching-in-the-accelerometer.patch ++++++ >From 1d010426c01044350b2b32d8b3af5d064f7dfe27 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <[email protected]> Date: Thu, 10 Jan 2013 14:23:23 +0100 Subject: [PATCH] udev: Fix device matching in the accelerometer As we were searching by ID_PATH, it would have been possible for us to find a sibling device instead of the device we were looking for. This fixes device matching on the WeTab with the upstream kernel, as it was trying to use the "Asus Laptop extra buttons" device instead of the accelerometer. --- src/udev/accelerometer/accelerometer.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c index 21f5193..2fea388 100644 --- a/src/udev/accelerometer/accelerometer.c +++ b/src/udev/accelerometer/accelerometer.c @@ -257,7 +257,6 @@ int main (int argc, char** argv) char devpath[PATH_MAX]; char *devnode; - const char *id_path; struct udev_enumerate *enumerate; struct udev_list_entry *list_entry; @@ -303,18 +302,10 @@ int main (int argc, char** argv) return 1; } - id_path = udev_device_get_property_value(dev, "ID_PATH"); - if (id_path == NULL) { - fprintf (stderr, "unable to get property ID_PATH for '%s'", devpath); - return 0; - } - /* Get the children devices and find the devnode */ - /* FIXME: use udev_enumerate_add_match_parent() instead */ devnode = NULL; enumerate = udev_enumerate_new(udev); - udev_enumerate_add_match_property(enumerate, "ID_PATH", id_path); - udev_enumerate_add_match_subsystem(enumerate, "input"); + udev_enumerate_add_match_parent(enumerate, dev); udev_enumerate_scan_devices(enumerate); udev_list_entry_foreach(list_entry, udev_enumerate_get_list_entry(enumerate)) { struct udev_device *device; -- 1.7.7 ++++++ journalctl-require-argument-for-priority ++++++ --- /var/tmp/diff_new_pack.K68NRt/_old 2013-01-30 11:20:41.000000000 +0100 +++ /var/tmp/diff_new_pack.K68NRt/_new 2013-01-30 11:20:41.000000000 +0100 @@ -9,11 +9,11 @@ src/journal/journalctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c -index cccd8a7..011a11b 100644 ---- a/src/journal/journalctl.c -+++ b/src/journal/journalctl.c -@@ -157,7 +157,7 @@ static int parse_argv(int argc, char *argv[]) { +Index: systemd-195/src/journal/journalctl.c +=================================================================== +--- systemd-195.orig/src/journal/journalctl.c ++++ systemd-195/src/journal/journalctl.c +@@ -158,7 +158,7 @@ static int parse_argv(int argc, char *ar { "this-boot", no_argument, NULL, 'b' }, { "directory", required_argument, NULL, 'D' }, { "header", no_argument, NULL, ARG_HEADER }, @@ -22,6 +22,3 @@ { "setup-keys", no_argument, NULL, ARG_SETUP_KEYS }, { "interval", required_argument, NULL, ARG_INTERVAL }, { "verify", no_argument, NULL, ARG_VERIFY }, --- -1.7.10.4 - ++++++ systemd-udev-root-symlink ++++++ [Unit] Description=Create dynamic rule for /dev/root link Before=udev.service DefaultDependencies=no [Service] Type=oneshot RemainAfterExit=yes ExecStart=@@PREFIX@@/write_dev_root_rule -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
