[systemd-commits] 4 commits - docs/gudev docs/libudev .gitignore Makefile.am man/.gitignore man/udevadm.xml src/cgls

Zbigniew Jędrzejewski-Szmek zbyszek at kemper.freedesktop.org
Sat Dec 1 08:00:37 PST 2012


 .gitignore               |  219 ++++++++++++++++++++++-------------------------
 Makefile.am              |    1 
 docs/gudev/Makefile.am   |    2 
 docs/libudev/Makefile.am |    2 
 man/.gitignore           |    1 
 man/udevadm.xml          |    6 -
 src/cgls/cgls.c          |    7 -
 7 files changed, 113 insertions(+), 125 deletions(-)

New commits:
commit 04ba11b2c4ab69dcae5d623808bed76be825dbac
Author: Eelco Dolstra <eelco.dolstra at logicblox.com>
Date:   Fri Nov 30 13:36:05 2012 +0100

    man: fix some typos

diff --git a/man/udevadm.xml b/man/udevadm.xml
index 3bd7738..7791028 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -429,9 +429,9 @@
         <varlistentry>
           <term><option>--update</option></term>
           <listitem>
-            <para>Compile the hardware dabase information located in /usr/lib/udev/hwdb.d/,
-            /etc/udev/hwdb.d/ and store it in <filename>/etc/udev/hwdb.bin</filename>. This should be done with
-            any update to the source files, it will not be called automatically. The running
+            <para>Compile the hardware database information located in /usr/lib/udev/hwdb.d/,
+            /etc/udev/hwdb.d/ and store it in <filename>/etc/udev/hwdb.bin</filename>. This should be done after
+            any update to the source files; it will not be called automatically. The running
             udev daemon will detect a new database on its own and does not need to be
             notified about it.</para>
           </listitem>

commit b5a223bfcf2ebcf374973b29870a5e80fb42b8be
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Dec 1 10:37:52 2012 +0100

    build-sys: use parallel tests driver
    
    This saves test output to individual .log files.
    
    The driver is only used in /Makefile.am, not in
    /docs/*udev/Makefile.am because the latter don't seem to work with
    this driver. They don't produce much output anyway.
    
    .gitignore is alphabetized, and .log files are added to it.
    Generated files from /build-aux are removed from the list.

diff --git a/.gitignore b/.gitignore
index 70cadf8..a5d0510 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,147 +1,136 @@
-/test-calendarspec
-/test-catalog
-/test-replace-var
-/test-journal-enum
-/test-sleep
-/localectl
+/Makefile
+/TAGS
+/accelerometer
+/ata_id
+/build-aux
+/cdrom_id
+/collect
+/gtk-doc.make
 /hostnamectl
-/timedatectl
-/test-date
 /install-tree
-/systemd-journal-gatewayd
-/test-mmap-cache
-/test-unit-file
-/test-log
-/test-journal-verify
-/test-journal-match
-/test-journal-stream
-/test-unit-name
-/systemd-system-update-generator
-/systemd-fstab-generator
-/systemd-delta
-/systemd-sleep
-/systemd-inhibit
-/systemd-remount-fs
-/build-aux
-/test-watchdog
-/test-journal-send
-/test-journal-syslog
-/systemd-multi-seat-x
-/systemd-cgtop
-/systemd-coredump
-/systemd-cat
-/systemd-rc-local-generator
 /journalctl
-/systemd-journald
-/test-id128
-/test-journal
-/test-install
-/test-inhibit
+/keymap
+/libtool
+/localectl
+/loginctl
+/mtd_probe
 /org.freedesktop.hostname1.xml
 /org.freedesktop.locale1.xml
-/test-login
-/loginctl
-/systemd-localed
-/systemd-timedated
+/org.freedesktop.systemd1.*.xml
 /org.freedesktop.timedate1.xml
-/systemd-logind
-/systemd-uaccess
-/systemd-hostnamed
-/systemd-binfmt
-/systemd-getty-generator
-/systemd-nspawn
-/systemd-stdio-bridge
-/systemd-machine-id-setup
-/systemd-detect-virt
-/systemd-sysctl
-/test-strv
+/scsi_id
+/systemadm
+/systemctl
+/systemd
 /systemd-ac-power
-/systemd-timestamp
+/systemd-ask-password
+/systemd-binfmt
+/systemd-cat
+/systemd-cgls
+/systemd-cgroups-agent
+/systemd-cgtop
+/systemd-coredump
 /systemd-coredumpctl
 /systemd-cryptsetup
 /systemd-cryptsetup-generator
-/systemd-tty-ask-password-agent
+/systemd-delta
+/systemd-detect-virt
 /systemd-fsck
-/systemd-quotacheck
-/systemd-user-sessions
-/systemd-shutdown
-/systemd-tmpfiles
-/systemd-readahead
-/systemd-reply-password
+/systemd-fstab-generator
+/systemd-getty-generator
 /systemd-gnome-ask-password-agent
-/systemd-ask-password
+/systemd-hostnamed
+/systemd-inhibit
+/systemd-initctl
+/systemd-journal-gatewayd
+/systemd-journald
 /systemd-kmsg-syslogd
-/systemd-remount-api-vfs
-/test-hostname
+/systemd-localed
+/systemd-logind
+/systemd-machine-id-setup
 /systemd-modules-load
-/systemd-vconsole-setup
-/systemd-shutdownd
+/systemd-multi-seat-x
+/systemd-notify
+/systemd-nspawn
+/systemd-quotacheck
 /systemd-random-seed
+/systemd-rc-local-generator
+/systemd-readahead
+/systemd-remount-api-vfs
+/systemd-remount-fs
+/systemd-reply-password
+/systemd-shutdown
+/systemd-shutdownd
+/systemd-sleep
+/systemd-stdio-bridge
+/systemd-sysctl
+/systemd-system-update-generator
+/systemd-timedated
+/systemd-timestamp
+/systemd-tmpfiles
+/systemd-tty-ask-password-agent
+/systemd-uaccess
+/systemd-udevd
 /systemd-update-utmp
-/test-env-replace
-/systemd-cgls
+/systemd-user-sessions
+/systemd-vconsole-setup
+/tags
+/test-calendarspec
+/test-catalog
 /test-cgroup
-.libs/
-/systemd-notify
 /test-daemon
-/org.freedesktop.systemd1.*.xml
-/test-ns
-/test-loopback
-/systemd-cgroups-agent
-/systemd-initctl
-/systemd
+/test-date
 /test-engine
+/test-env-replace
+/test-hostname
+/test-id128
+/test-inhibit
+/test-install
 /test-job-type
+/test-journal
+/test-journal-enum
+/test-journal-match
+/test-journal-send
+/test-journal-stream
+/test-journal-syslog
+/test-journal-verify
+/test-libudev
+/test-log
+/test-login
+/test-loopback
+/test-mmap-cache
+/test-ns
+/test-replace-var
 /test-sched-prio
-/systemctl
-/systemadm
-.dirstamp
-*.1
-*.3
-*.5
-*.7
-*.8
-*.html
-*~
-*.o
-*.lo
+/test-sleep
+/test-strv
+/test-udev
+/test-unit-file
+/test-unit-name
+/test-watchdog
+/timedatectl
+/udevadm
+/v4l_id
+/*.tar.bz2
+/*.tar.gz
+/*.tar.xz
+*.log
 *.a
+*.cache
+*.html
 *.la
+*.lo
+*.o
+*.stamp
+*~
 .deps/
+.dirstamp
+.libs/
 Makefile.in
 aclocal.m4
-*.cache
-compile
-config.guess
 config.h
 config.h.in
 config.log
 config.status
-config.sub
 configure
-depcomp
-install-sh
-missing
 stamp-*
-*.stamp
-/Makefile
-/ltmain.sh
-/*.tar.xz
-/*.tar.gz
-/*.tar.bz2
-/libtool
-/accelerometer
-/ata_id
-/cdrom_id
-/collect
-/gtk-doc.make
-/keymap
-/mtd_probe
-/scsi_id
-/udevadm
-/systemd-udevd
-/v4l_id
-/test-libudev
-/test-udev
-/TAGS
-/tags
diff --git a/Makefile.am b/Makefile.am
index f77a160..b40a1c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
-AUTOMAKE_OPTIONS = color-tests
+AUTOMAKE_OPTIONS = color-tests parallel-tests
 
 SUBDIRS = . po
 
diff --git a/man/.gitignore b/man/.gitignore
index cf8c17c..e97cda7 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1 +1,2 @@
 /systemd.directives.xml
+/*.[13578]

commit 47cd54a994c1e0a04fd7592e141fb46e29fa070b
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Dec 1 10:13:30 2012 +0100

    build-sys: color test results

diff --git a/Makefile.am b/Makefile.am
index a730ffe..f77a160 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
+AUTOMAKE_OPTIONS = color-tests
 
 SUBDIRS = . po
 
diff --git a/docs/gudev/Makefile.am b/docs/gudev/Makefile.am
index 57334b6..26c8652 100644
--- a/docs/gudev/Makefile.am
+++ b/docs/gudev/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 # We require automake 1.10 at least.
-AUTOMAKE_OPTIONS = 1.10
+AUTOMAKE_OPTIONS = 1.10 color-tests
 
 # This is a blank Makefile.am for using gtk-doc.
 # Copy this to your project's API docs directory and modify the variables to
diff --git a/docs/libudev/Makefile.am b/docs/libudev/Makefile.am
index c6d7b8c..87196e8 100644
--- a/docs/libudev/Makefile.am
+++ b/docs/libudev/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 # We require automake 1.10 at least.
-AUTOMAKE_OPTIONS = 1.10
+AUTOMAKE_OPTIONS = 1.10 color-tests
 
 # This is a blank Makefile.am for using gtk-doc.
 # Copy this to your project's API docs directory and modify the variables to

commit 6f862a69ecc9ca92899047d2cb0bbdd72513a3cf
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Nov 19 20:19:39 2012 +0100

    cgls: automatic cleanup

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index b2cd968..ad59c01 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
                 }
 
         } else {
-                char *p;
+                char _cleanup_free_ *p;
 
                 p = get_current_dir_name();
                 if (!p) {
@@ -150,7 +150,7 @@ int main(int argc, char *argv[]) {
                         printf("Working Directory %s:\n", p);
                         r = show_cgroup_by_path(p, NULL, 0, arg_kernel_threads, arg_all);
                 } else {
-                        char *root = NULL;
+                        char _cleanup_free_ *root = NULL;
                         const char *t = NULL;
 
                         r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root);
@@ -164,10 +164,7 @@ int main(int argc, char *argv[]) {
                         }
 
                         r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0, arg_kernel_threads, arg_all);
-                        free(root);
                 }
-
-                free(p);
         }
 
         if (r < 0)



More information about the systemd-commits mailing list