Re: [systemd-devel] [PATCH] build: configure option to disable hibernation
On Sun, Sep 7, 2014 at 11:32 PM, Ivan Shapovalov wrote: > On Tuesday 02 September 2014 at 12:31:49, Umut Tezduyar Lindskog wrote: >> --- >> Makefile.am | 52 >> configure.ac |6 ++ >> 2 files changed, 38 insertions(+), 20 deletions(-) > > Hi, > > thanks for doing this (I'm very unfamiliar with autotools). > > However, I think that the name you've picked for the switch (and commit msg) > is > too broad. We're configuring support for hibernation resume, not hibernation > itself. Hibernation without hibernation resume support does not make much sense, so I'd be happy to take a patch to make the switch do as it says and disable hibernation support fully. Cheers, Tom ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] build: configure option to disable hibernation
On Tuesday 02 September 2014 at 12:31:49, Umut Tezduyar Lindskog wrote: > --- > Makefile.am | 52 > configure.ac |6 ++ > 2 files changed, 38 insertions(+), 20 deletions(-) Hi, thanks for doing this (I'm very unfamiliar with autotools). However, I think that the name you've picked for the switch (and commit msg) is too broad. We're configuring support for hibernation resume, not hibernation itself. -- Ivan Shapovalov / intelfx / signature.asc Description: This is a digitally signed message part. ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] build: configure option to disable hibernation
On Tue, 02.09.14 12:31, Umut Tezduyar Lindskog (umut.tezdu...@axis.com) wrote: Applied! Thanks! > --- > Makefile.am | 52 > configure.ac |6 ++ > 2 files changed, 38 insertions(+), 20 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 1991fd0..58e5ce6 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -378,15 +378,13 @@ rootlibexec_PROGRAMS = \ > systemd-sleep \ > systemd-bus-proxyd \ > systemd-socket-proxyd \ > - systemd-update-done \ > - systemd-hibernate-resume > + systemd-update-done > > systemgenerator_PROGRAMS = \ > systemd-getty-generator \ > systemd-fstab-generator \ > systemd-system-update-generator \ > - systemd-debug-generator \ > - systemd-hibernate-resume-generator > + systemd-debug-generator > > dist_bashcompletion_DATA = \ > shell-completion/bash/busctl \ > @@ -453,7 +451,6 @@ dist_systemunit_DATA = \ > units/network-online.target \ > units/nss-lookup.target \ > units/nss-user-lookup.target \ > - units/hibernate.target \ > units/hybrid-sleep.target \ > units/poweroff.target \ > units/reboot.target \ > @@ -511,7 +508,6 @@ nodist_systemunit_DATA = \ > units/emergency.service \ > units/rescue.service \ > units/user@.service \ > - units/systemd-hibernate.service \ > units/systemd-hybrid-sleep.service \ > units/systemd-suspend.service \ > units/systemd-halt.service \ > @@ -530,8 +526,7 @@ nodist_systemunit_DATA = \ > units/initrd-udevadm-cleanup-db.service \ > units/initrd-switch-root.service \ > units/systemd-nspawn@.service \ > - units/systemd-update-done.service \ > - units/systemd-hibernate-resume@.service > + units/systemd-update-done.service > > dist_userunit_DATA = \ > units/user/basic.target \ > @@ -569,7 +564,6 @@ EXTRA_DIST += \ > units/systemd-fsck-root.service.in \ > units/u...@.service.in \ > units/debug-shell.service.in \ > - units/systemd-hibernate.service.in \ > units/systemd-hybrid-sleep.service.in \ > units/systemd-suspend.service.in \ > units/quotaon.service.in \ > @@ -578,8 +572,7 @@ EXTRA_DIST += \ > units/initrd-udevadm-cleanup-db.service.in \ > units/initrd-switch-root.service.in \ > units/systemd-nsp...@.service.in \ > - units/systemd-update-done.service.in \ > - units/systemd-hibernate-res...@.service.in > + units/systemd-update-done.service.in > > CLEANFILES += \ > units/console-shell.service.m4 \ > @@ -2112,14 +2105,6 @@ systemd_delta_LDADD = \ > libsystemd-shared.la > > # > -- > -systemd_hibernate_resume_SOURCES = \ > - src/hibernate-resume/hibernate-resume.c > - > -systemd_hibernate_resume_LDADD = \ > - libsystemd-internal.la \ > - libsystemd-shared.la > - > -# > -- > systemd_getty_generator_SOURCES = \ > src/getty-generator/getty-generator.c > > @@ -2153,6 +2138,20 @@ systemd_system_update_generator_LDADD = \ > libsystemd-shared.la > > # > -- > +if ENABLE_HIBERNATE > +systemgenerator_PROGRAMS += \ > +systemd-hibernate-resume-generator > + > +rootlibexec_PROGRAMS += \ > +systemd-hibernate-resume > + > +systemd_hibernate_resume_SOURCES = \ > +src/hibernate-resume/hibernate-resume.c > + > +systemd_hibernate_resume_LDADD = \ > +libsystemd-internal.la \ > +libsystemd-shared.la > + > systemd_hibernate_resume_generator_SOURCES = \ > src/resume-generator/resume-generator.c > > @@ -2160,8 +2159,21 @@ systemd_hibernate_resume_generator_LDADD = \ > libsystemd-label.la \ > libsystemd-shared.la > > -if ENABLE_EFI > +EXTRA_DIST += \ > +units/systemd-hibernate.service.in \ > +units/systemd-hibernate-res...@.service.in > + > +dist_systemunit_DATA += \ > +units/hibernate.target > + > +nodist_systemunit_DATA += \ > +units/systemd-hibernate.service \ > +units/systemd-hibernate-resume@.service > + > +endif > + > # > -- > +if ENABLE_EFI > systemgenerator_PROGRAMS += \ > systemd-efi-boot-generator > > diff --git a/configure.ac b/configure.ac > index 543828c..99c01d2 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -1168,6 +1168,12 @@ AS_IF([test "x$enable_manpages" != xno], > [have_manpages=yes]) > AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) > > # > -- > +AC_ARG_ENABLE(hibernate, > + [AC_HELP_STRING([--disable-hibernate], [disable hibernation > support])], > + enable_hib
[systemd-devel] [PATCH] build: configure option to disable hibernation
--- Makefile.am | 52 configure.ac |6 ++ 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1991fd0..58e5ce6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -378,15 +378,13 @@ rootlibexec_PROGRAMS = \ systemd-sleep \ systemd-bus-proxyd \ systemd-socket-proxyd \ - systemd-update-done \ - systemd-hibernate-resume + systemd-update-done systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ systemd-system-update-generator \ - systemd-debug-generator \ - systemd-hibernate-resume-generator + systemd-debug-generator dist_bashcompletion_DATA = \ shell-completion/bash/busctl \ @@ -453,7 +451,6 @@ dist_systemunit_DATA = \ units/network-online.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ - units/hibernate.target \ units/hybrid-sleep.target \ units/poweroff.target \ units/reboot.target \ @@ -511,7 +508,6 @@ nodist_systemunit_DATA = \ units/emergency.service \ units/rescue.service \ units/user@.service \ - units/systemd-hibernate.service \ units/systemd-hybrid-sleep.service \ units/systemd-suspend.service \ units/systemd-halt.service \ @@ -530,8 +526,7 @@ nodist_systemunit_DATA = \ units/initrd-udevadm-cleanup-db.service \ units/initrd-switch-root.service \ units/systemd-nspawn@.service \ - units/systemd-update-done.service \ - units/systemd-hibernate-resume@.service + units/systemd-update-done.service dist_userunit_DATA = \ units/user/basic.target \ @@ -569,7 +564,6 @@ EXTRA_DIST += \ units/systemd-fsck-root.service.in \ units/u...@.service.in \ units/debug-shell.service.in \ - units/systemd-hibernate.service.in \ units/systemd-hybrid-sleep.service.in \ units/systemd-suspend.service.in \ units/quotaon.service.in \ @@ -578,8 +572,7 @@ EXTRA_DIST += \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ units/systemd-nsp...@.service.in \ - units/systemd-update-done.service.in \ - units/systemd-hibernate-res...@.service.in + units/systemd-update-done.service.in CLEANFILES += \ units/console-shell.service.m4 \ @@ -2112,14 +2105,6 @@ systemd_delta_LDADD = \ libsystemd-shared.la # -- -systemd_hibernate_resume_SOURCES = \ - src/hibernate-resume/hibernate-resume.c - -systemd_hibernate_resume_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la - -# -- systemd_getty_generator_SOURCES = \ src/getty-generator/getty-generator.c @@ -2153,6 +2138,20 @@ systemd_system_update_generator_LDADD = \ libsystemd-shared.la # -- +if ENABLE_HIBERNATE +systemgenerator_PROGRAMS += \ +systemd-hibernate-resume-generator + +rootlibexec_PROGRAMS += \ +systemd-hibernate-resume + +systemd_hibernate_resume_SOURCES = \ +src/hibernate-resume/hibernate-resume.c + +systemd_hibernate_resume_LDADD = \ +libsystemd-internal.la \ +libsystemd-shared.la + systemd_hibernate_resume_generator_SOURCES = \ src/resume-generator/resume-generator.c @@ -2160,8 +2159,21 @@ systemd_hibernate_resume_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la -if ENABLE_EFI +EXTRA_DIST += \ +units/systemd-hibernate.service.in \ +units/systemd-hibernate-res...@.service.in + +dist_systemunit_DATA += \ +units/hibernate.target + +nodist_systemunit_DATA += \ +units/systemd-hibernate.service \ +units/systemd-hibernate-resume@.service + +endif + # -- +if ENABLE_EFI systemgenerator_PROGRAMS += \ systemd-efi-boot-generator diff --git a/configure.ac b/configure.ac index 543828c..99c01d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1168,6 +1168,12 @@ AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) # -- +AC_ARG_ENABLE(hibernate, + [AC_HELP_STRING([--disable-hibernate], [disable hibernation support])], + enable_hibernate=$enableval, enable_hibernate=yes) +AM_CONDITIONAL(ENABLE_HIBERNATE, [test x$enable_hibernate = xyes]) + +# -- AC_ARG_ENABLE(ldconfig, [AC_HELP_STRING([--disable-ldconfig], [disable ldcon
