[systemd-devel] [PATCH] udev: link accelerometor and cdrom_id to the internal library
These helpers were originally linking to libudev; this changes them to link to libudev-private. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3318829..df2022e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2053,7 +2053,7 @@ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c cdrom_id_LDADD = \ - libudev.la \ + libudev-private.la \ libsystemd-shared.la udevlibexec_PROGRAMS += \ @@ -2107,7 +2107,7 @@ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c accelerometer_LDADD = \ - libudev.la -lm \ + libudev-private.la -lm \ libsystemd-shared.la udevlibexec_PROGRAMS += \ -- 1.7.12.4 ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] killing udev for non-systemd systems
Hey Lennart, Kay and all, On Wed, Aug 01, 2012 at 06:58:39PM +0200, Lennart Poettering wrote: Well, we intent to continue to make it possible to run udevd outside of systemd. But that's about it. We will not polish that, or add new features to that or anything. OTOH we do polish behaviour of udev when used *within* systemd however, and that's our primary focus. And what we will certainly not do is compromise the uniform integration into systemd for some cosmetic improvements for non-systemd systems. (Yes, udev on non-systemd systems is in our eyes a dead end, in case you haven't noticed it yet. I am looking forward to the day when we can drop that support entirely.) There are a number of reasons from what I see on my distro's development list and from what I've seen insome patches proposed here, that everyone isn't comfortable with systemd. I thought the merge was more for administrative reasons, because there is common source code between systemd and udev that you did not want to provide as libraries. Now though, with the attitude toward non-systemd systems that I see above, I am starting to wonder. You have taken a piece of software which is important to many linux systems (udev) and merged it into an init system (systemd) which is not used everywhere for a number of reasons. Now you are planning to kill udev for systems that do not use systemd. Why is that? Why are you saying that udev on non-systemd systems is a dead end? Is there some alternative for non-systemd systems? William pgp0yNhUoOJ4y.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] tools for non-systemd systems
Thanks for getting me started on this. The attachedd list is what will go in a systemd-tools package that I'm working on for gentoo. This will not be installed if someone is using systemd. Dave and Lennart, can you please look this over and let me know if I should add back anything or drop anything? Thanks, William etc/binfmt.d etc/modules-load.d etc/sysctl.d etc/tmpfiles.d etc/udev etc/udev/rules.d etc/udev/udev.conf usr/bin usr/bin/systemd-ask-password usr/bin/systemd-delta usr/bin/systemd-detect-virt usr/bin/systemd-tmpfiles usr/bin/systemd-tty-ask-password-agent usr/bin/udevadm usr/include usr/include/libudev.h usr/lib usr/lib/binfmt.d usr/lib/libudev.la usr/lib/libudev.so usr/lib/libudev.so.1 usr/lib/libudev.so.1.0.1 usr/lib/modules-load.d usr/lib/pkgconfig usr/lib/pkgconfig/libudev.pc usr/lib/sysctl.d usr/lib/systemd usr/lib/systemd/systemd-ac-power usr/lib/systemd/systemd-binfmt usr/lib/systemd/systemd-modules-load usr/lib/systemd/systemd-random-seed usr/lib/systemd/systemd-remount-fs usr/lib/systemd/systemd-reply-password usr/lib/systemd/systemd-sysctl usr/lib/systemd/systemd-timestamp usr/lib/systemd/systemd-udevd usr/lib/tmpfiles.d usr/lib/tmpfiles.d/systemd.conf usr/lib/tmpfiles.d/tmp.conf usr/lib/tmpfiles.d/x11.conf usr/lib/udev usr/lib/udev/accelerometer usr/lib/udev/ata_id usr/lib/udev/cdrom_id usr/lib/udev/collect usr/lib/udev/devices usr/lib/udev/mtd_probe usr/lib/udev/rules.d usr/lib/udev/rules.d/42-usb-hid-pm.rules usr/lib/udev/rules.d/50-udev-default.rules usr/lib/udev/rules.d/60-cdrom_id.rules usr/lib/udev/rules.d/60-persistent-alsa.rules usr/lib/udev/rules.d/60-persistent-input.rules usr/lib/udev/rules.d/60-persistent-serial.rules usr/lib/udev/rules.d/60-persistent-storage-tape.rules usr/lib/udev/rules.d/60-persistent-storage.rules usr/lib/udev/rules.d/60-persistent-v4l.rules usr/lib/udev/rules.d/61-accelerometer.rules usr/lib/udev/rules.d/75-net-description.rules usr/lib/udev/rules.d/75-probe_mtd.rules usr/lib/udev/rules.d/75-tty-description.rules usr/lib/udev/rules.d/78-sound-card.rules usr/lib/udev/rules.d/80-drivers.rules usr/lib/udev/rules.d/95-udev-late.rules usr/lib/udev/rules.d/99-systemd.rules usr/lib/udev/scsi_id usr/lib/udev/v4l_id usr/share/doc/systemd-tools-185 usr/share/doc/systemd-tools-185/DISTRO_PORTING usr/share/doc/systemd-tools-185/NEWS usr/share/doc/systemd-tools-185/README usr/share/doc/systemd-tools-185/TODO usr/share/man/man1/systemd-detect-virt.1 usr/share/man/man5/binfmt.d.5 usr/share/man/man5/modules-load.d.5 usr/share/man/man5/sysctl.d.5 usr/share/man/man5/tmpfiles.d.5 usr/share/man/man7/udev.7 usr/share/man/man8/systemd-binfmt.8 usr/share/man/man8/systemd-modules-load.8 usr/share/man/man8/systemd-sysctl.8 usr/share/man/man8/systemd-tmpfiles.8 usr/share/man/man8/systemd-udevd.8 usr/share/man/man8/udevadm.8 usr/share/pkgconfig usr/share/pkgconfig/udev.pc pgpKPAl0lDHPN.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] tools for non-systemd systems
Hey Lennart, can yu give me a list of tools in the systemd tarball that non-systemd systems can use besides systemd-tmpfiles and udev? Thanks, William pgpqL8nNvCxsv.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] Minimal builds
On Thu, Jun 21, 2012 at 12:50:14PM +0200, Malte Starostik wrote: Am Donnerstag, 21. Juni 2012, 11:48:29 schrieb Lennart Poettering: On Wed, 20.06.12 15:56, William Hubbs (w.d.hu...@gmail.com) wrote: It isn't for us, because, for example, if I use option 1, I have to do the opposite of the second half of it. Our pm installs everything in the place pointed to by DESTDIR, then I have to manually remove the things I don't need. As was pointed out in a thread earlier, this is very error-prone and definitely could lead to issues. Hmm? This really appears to be a broken package manager. Sorry, but I am not going to work around the limitations of downstream package managers in upstream packages if everybody else gets this right. Oh well, just because the cherry picking happens by negating the list of what you want and then deleting everything else doesn't really make this broken, does it? In fact it optimises for the usual case where you want to include everything you get from make install. That's correct. Our pm isn't broken. Basically we do make DESTDIR=/some/staging/tree install Then we can process the image in /some/staging/tree before it is actually installed to the live fs. Everyone else gets this right because you don't normally have to go into the image and trash most of it to get what you need. I see how the needs of non-BLOB distros/users might not be your top priority and personally I'd definately rather push migration to systemd than investing too much in a split build. Still it seems totally broken that you have to order a five course meal then trash all but the soup just because the menu contains no standalone soup. Oh right, but you fully support eating just the soup. Great analogy. I understand that binary package maintainers can do this very easily, but it doesn't work that way on a source based distro. What we are being asked to do is very inefficient imo, and it isn't because of our package manager. WRT migrating to systemd: I am just a package maintainer. I am not in a position where I can tell our distro that we must do that, and knowing what I know about our distro, I'm pretty sure that migrating to systemd isn't going to happen at this point. Well, maybe those who need a udev-only build could instead coordinate their efforts so there only needs to be one set of patches/*.pc hacks/cherry picking scripts. Maybe the systemd maintainers could accept such a thing for a contrib/ subdir? Something needs to be done, because there are clearly people across multiple distros who need a udev only build for whatever reason. William pgpaf5tqticmG.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] setting up to allow separate udev and systemd builds
On Wed, Jun 20, 2012 at 09:40:39PM +0200, Robert Schwebel wrote: Currently, the workflow would be like this: 1) build other components 2a) build prerequisites necessary for systemd, which are otherwhise unneeded; this needs to be installed into the local sysroot in order to let systemd pick up the prerequisites 2b) build systemd+udev 2c) somehow remove the wrong components from sysroot again, as all the rest of the system is not allowed to see them (otherwhise their configure scripts would assume the features to be there) 2d) install only udev 3) move on Instead of: 1) build other components 2) configure with just the right switches, make 3) move on In ptxdist, we have 700+ packages which don't need this kind of special handling (especially 2c will really be a pain). And all this because of something which can be solved in configure.ac. Note: This discussion shouldn't be about if source distributions are a valid use case. Fact is that there are source distributions and people have their reasons to use them. And all source distributions have this issue. We should avoid that everyone implements his own uggly workaround. Agreed. As shown in this thread, there are definitely enough use cases out there for building stand-alone udev that this should be handled upstream so that everyone doesn't have to invent a workaround. Like I've said multiple times on this thread, I don't care whether or not *my* patches get used, but it would be greatly appreciated if there was a way to build udev standalone. Thanks for your consideration, William pgpcmny1kQMIK.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] Minimal builds
On Wed, Jun 20, 2012 at 06:22:49PM +0200, Lennart Poettering wrote: Heya, regarding the whole discussion on minimal builds and people wanting to pick specific parts of the systemd build leaving out others, beyond what the configure switches offer: Here are some guidelines how we recommend people to do this: http://freedesktop.org/wiki/Software/systemd/MinimalBuilds From our side this should be enough to settle the discussion. It isn't for us, because, for example, if I use option 1, I have to do the opposite of the second half of it. Our pm installs everything in the place pointed to by DESTDIR, then I have to manually remove the things I don't need. As was pointed out in a thread earlier, this is very error-prone and definitely could lead to issues. Another thing to think about from our side is, although the main components compile quickly on a pc, how long would it take to compile everything on an ARM-based machine for example? I have no idea, so it could end up being really annoying to users of that platform for us to compile all of the main components and turn around and remove most of them. Thanks for your consideration, William pgpiH93qgo8ee.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] setting up to allow separate udev and systemd builds
Hello Auke, On Fri, Jun 15, 2012 at 04:26:36AM +, Kok, Auke-jan H wrote: On Fri, Jun 15, 2012 at 2:32 AM, William Hubbs w.d.hu...@gmail.com wrote: Hello Auke, I will answer your concerns as best as I can below. On Thu, Jun 14, 2012 at 03:35:09PM -0700, Kok, Auke-jan H wrote: 1) Timing. systemd+udevd just got merged. We had a huge build system change. Let's not change it drastically again entirely now. From the point of view of a source based distro, the build system as it currently stands is broken. Upstream supports running udev without systemd, so why not building udev standalone as well, especially since there is interest in doing the work? It's not broken at all. What is broken is the assumption that one can just run `make install` willy nilly in a source distro and overwrite files in the live system. This is a design problem in ALL source based distro's (including the one I worked on for years) and can't be fixed by upstream. Source distro's should really work on doing a proper `make DESTDIR= install` or use fakeroot/chroot installs and buffer the installation of files before the real rootfs is overwritten. Not solving that is an error that the source distributions should solve, and definitely should not be the reason for an upstream project to jump to the aid of source distros. As Wulf already pointed out, gentoo already does this properly, and we also do our own sanity checks before we move the package to the live fs. This is definitely not an issue we expect upstream projects to solve other than supporting DESTDIR, which udev and systemd already do. 4) Can be maintained out of tree for now: Nothing prevents gentoo from keeping this patch out of tree for their purposes. Yes, we could, but what about exherbo, funtoo, linux from scratch and the other source based distros that may be out there? they could pull the patch from gentoo's repository. I suppose they could if they were comfortable doing that, but I tend to agree with Wulf on this; I would rather not have custom patches being shared between distros. Honestly I would rather have as few custom patches as possible; custom patches can be a headache to maintain. I think this patch would be a lot more acceptable if you drop the split Makefile.am, remove the --disable-systemd option and just create an extra make install-udev target. It would be a lot smaller too. I could rework it so I don't split up the makefiles, sure, but let me explain why the install-udev target does not solve the issue we are trying to solve. systemd has several more dependencies than udev. Because of that and because of the way the build system is setup to only do a full systemd build, I have to install all of systemd's dependencies on every gentoo user's system regardless of whether or not they are using systemd or udev standalone. What I need is a way to tell the configure script and Makefiles that I am only interested in building udev and not a full systemd build. There was another patch that came from the linux from scratch community posted on the linux-hotplug list [1]. I spoke with Kay about that patch, and he didn't sound like he liked it too much. William [1] http://www.spinics.net/lists/hotplug/msg05529.html pgpWasdXTe8M6.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] setting up to allow separate udev and systemd builds
Hi Lucas, On Thu, Jun 14, 2012 at 10:48:50AM -0300, Lucas De Marchi wrote: Hi William, On Tue, Jun 12, 2012 at 2:52 PM, William Hubbs w.d.hu...@gmail.com wrote: All, on source-based distros like gentoo or lfs, and on distros that do not Don't you have the ability to split the built package in gentoo? I don't quite understand your question; there is no built package that we distribute. Gentoo is like linux from scratch or the bsd ports collection. We distribute build scripts that build the software on the end users' systems. The issue is that the udev build script now has to install all of the build time dependencies that systemd needs even though udev doesn't use them so that the configure script will not fail. Once these patches are in the tree, I do need to write one more that fixes configure.ac so that it does the systemd specific checks only when systemd is enabled, but I need more information before I can write that. I need to know which dependencies (besides dbus and intltool) are not needed by udev. Thanks, William pgpsX0BlEPBXl.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] setting up to allow separate udev and systemd builds
On Thu, Jun 14, 2012 at 11:54:36AM -0700, Kok, Auke-jan H wrote: 3. Don't provide split udev/systemd packages and stay on udev-182 (or whatever the version was before the split). Now, I've been involved with a source-based distro myself for almost 12 years, and, at one point you just have to sell no to people who want every kitchen sink. That is exactly my point. There are people in these distros who see systemd as a kitchen sink they don't want. However, udev is more like coreutils, which they need. Just because you're a source distro, doesn't mean that you should be bleeding edge, and force upstream to potentially break the build for everyone already. Again you make my point for me. There are folks who see systemd as bleeding edge and are not comfortable running it, but they still need udev. Define how this forces upstream to break the build. The default state of my patches is to leave things as they are unless you mess with the two added configure switches. I do not see how this breaks anything. I'm no fan of these patches, and I'm less of a fan of them appearing *now*. Keep them in the refrigerator for 3 months, then post them. Why do you hate these patches so much? Like I said, I made sure not to change the default state, so if you don't mess with the configure switches you don't change anything. William pgpuVE41T1y4T.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] setting up to allow separate udev and systemd builds
On Thu, Jun 14, 2012 at 02:05:01PM -0700, Kok, Auke-jan H wrote: On Thu, Jun 14, 2012 at 1:40 PM, William Hubbs w.d.hu...@gmail.com wrote: That is exactly my point. There are people in these distros who see systemd as a kitchen sink they don't want. However, udev is more like coreutils, which they need. or pick mdev Would there be regressions if we do that though? I'm under the impression that mdev is a very stripped down version of udev. Just because you're a source distro, doesn't mean that you should be bleeding edge, and force upstream to potentially break the build for everyone already. Again you make my point for me. There are folks who see systemd as bleeding edge and are not comfortable running it, but they still need udev. and can stay on udev-182. unless they need something in 185, like a bug fix or something that has changed since then. Define how this forces upstream to break the build. The default state of my patches is to leave things as they are unless you mess with the two added configure switches. I do not see how this breaks anything. I'm no fan of these patches, and I'm less of a fan of them appearing *now*. Keep them in the refrigerator for 3 months, then post them. Why do you hate these patches so much? Like I said, I made sure not to change the default state, so if you don't mess with the configure switches you don't change anything. I don't hate them. I think the timing is inappropriate. I don't like multiple Makefile.am's though - that's bound to be problematic further on. What's so inappropriate about the timing, or to put it another way, why does timing matter so much? There was a patch proposed on the hotplug list which put the fixes in Makefile.am directly. I spoke with Kay on irc and he stated that he didn't like that patch. Nothing prevents you from staying on udev-182 for a few more weeks/months. You're not missing that much. That depends. are there fixes that any users need in the newer versions, or are the only differences new features? Either way, All I'm advocating for is supporting *building* udev standalone as well as *running* udev standalone. I've done the work. If there is a problem with the work I have done, I would like to know what it is so I can fix it. If there isn't a problem with it, why can't it be supported? Thanks, William pgpj2Qaj1pKlM.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] setting up to allow separate udev and systemd builds
On Thu, Jun 14, 2012 at 02:38:08PM -0700, Kok, Auke-jan H wrote: On Thu, Jun 14, 2012 at 2:28 PM, Wulf C. Krueger philant...@exherbo.org wrote: Hello Auke, On 14.06.2012 23:05, Kok, Auke-jan H wrote: or pick mdev Let me quote someone about mdev: Haha, mdev, yeah right. Have fun with that... greg k-h (Source: http://article.gmane.org/gmane.linux.gentoo.devel/73627) Nothing prevents you from staying on udev-182 for a few more weeks/months. You're not missing that much. What are we supposed to do in case of security issues with 182? do what source distro's do best. And what is that? William pgp5mDi7sFPhl.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] setting up to allow separate udev and systemd builds
Hello Auke, I will answer your concerns as best as I can below. On Thu, Jun 14, 2012 at 03:35:09PM -0700, Kok, Auke-jan H wrote: 1) Timing. systemd+udevd just got merged. We had a huge build system change. Let's not change it drastically again entirely now. From the point of view of a source based distro, the build system as it currently stands is broken. Upstream supports running udev without systemd, so why not building udev standalone as well, especially since there is interest in doing the work? 2) Splitting up of Makefile.am. Sounds like a disaster waiting to happen and a reversal of the whole idea of merging the code in the first place. Irrelivant. If the maintainers ask me to rework the patches so that Makefile.am is not split, I will do that. Like I have said, I am not attempting to change the _default_ state of things. 3) Urgency: none to low. Source distro's would be perfectly fine building and maintaining the few security and bug fixes needed. AFAIK the merge only removed features in udevd. Possibly, but why should we fork udev when it isn't necessary? 4) Can be maintained out of tree for now: Nothing prevents gentoo from keeping this patch out of tree for their purposes. Yes, we could, but what about exherbo, funtoo, linux from scratch and the other source based distros that may be out there? 5) Not in the best interest of systemd as a whole, this patch only increases fragmentation. I'd rather see someone maintain the non-merged udev source with fixes only. So how does us maintaining the non-merged udev sources with fixes reduce fragmentation? That seems to be a udev fork, which definitely would not be in anyone's best interest. I point back again to what I said under 3). I don't want to fork udev or stall on udev-182 over this. I would rather work with the maintainers to stay current. William pgpissdxGHj7f.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] setting up to allow separate udev and systemd builds
All, on source-based distros like gentoo or lfs, and on distros that do not use systemd as their init system, we need a way to build systemd and udev separately from each other so that udev can be built without all of systemd's build time dependencies. This series of patches splits up Makefile.am and adds configure switches so that we can switch on or off the affected parts of the build. By default, we still build everything. Once these are in, we can look at how to fix the build time dependencies so that only the relevant build time dependencies are selected. Any suggestions, comments, etc are welcome. [PATCH 1/5] build-sys: move common libraries to separate Makefile [PATCH 2/5] build-sys: move udev build to a separate makefile [PATCH 3/5] build-sys: move systemd build to a separate makefile [PATCH 4/5] build-sys: add --enable-systemd configure option [PATCH 5/5] build-sys: add --enable-udev configure option Thanks, William ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH 1/5] build-sys: move common libraries to separate Makefile
--- Makefile-shared.am | 117 Makefile.am| 99 +--- 2 files changed, 118 insertions(+), 98 deletions(-) create mode 100644 Makefile-shared.am diff --git a/Makefile-shared.am b/Makefile-shared.am new file mode 100644 index 000..cdd318b --- /dev/null +++ b/Makefile-shared.am @@ -0,0 +1,117 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- */ +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see http://www.gnu.org/licenses/. + +if HAVE_ACL +noinst_LTLIBRARIES += \ + libsystemd-acl.la + +libsystemd_acl_la_SOURCES = \ + src/shared/acl-util.c \ + src/shared/acl-util.h + +libsystemd_acl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(ACL_CFLAGS) + +libsystemd_acl_la_LIBADD = \ + $(ACL_LIBS) +endif + +# -- +noinst_LTLIBRARIES += \ + libsystemd-label.la + +libsystemd_label_la_SOURCES = \ + src/shared/cgroup-label.c \ + src/shared/socket-label.c \ + src/shared/label.c \ + src/shared/label.h \ + src/shared/mkdir.c \ + src/shared/mkdir.h \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h \ + src/shared/dev-setup.c \ + src/shared/dev-setup.h + +libsystemd_label_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) + +libsystemd_label_la_LIBADD = \ + $(SELINUX_LIBS) + +# -- +noinst_LTLIBRARIES += \ + libsystemd-shared.la + +libsystemd_shared_la_SOURCES = \ + src/shared/linux/auto_dev-ioctl.h \ + src/shared/linux/fanotify.h \ + src/shared/missing.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ + src/shared/util.c \ + src/shared/util.h \ + src/shared/virt.c \ + src/shared/virt.h \ + src/shared/path-util.c \ + src/shared/path-util.h \ + src/shared/hashmap.c \ + src/shared/hashmap.h \ + src/shared/set.c \ + src/shared/set.h \ + src/shared/strv.c \ + src/shared/strv.h \ + src/shared/conf-parser.c \ + src/shared/conf-parser.h \ + src/shared/log.c \ + src/shared/log.h \ + src/shared/ratelimit.h \ + src/shared/ratelimit.c \ + src/shared/exit-status.c \ + src/shared/exit-status.h \ + src/shared/utf8.c \ + src/shared/utf8.h \ + src/shared/pager.c \ + src/shared/pager.h \ + src/shared/ioprio.h \ + src/shared/socket-util.c \ + src/shared/socket-util.h \ + src/shared/conf-files.c \ + src/shared/conf-files.h \ + src/shared/cgroup-util.c \ + src/shared/cgroup-util.h \ + src/shared/cgroup-show.c \ + src/shared/cgroup-show.h \ + src/shared/unit-name.c \ + src/shared/unit-name.h \ + src/shared/utmp-wtmp.c \ + src/shared/utmp-wtmp.h \ + src/shared/watchdog.c \ + src/shared/watchdog.h \ + src/shared/spawn-ask-password-agent.c \ + src/shared/spawn-ask-password-agent.h \ + src/shared/specifier.c \ + src/shared/specifier.h \ + src/shared/spawn-polkit-agent.c \ + src/shared/spawn-polkit-agent.h \ + src/shared/hwclock.c \ + src/shared/hwclock.h diff --git a/Makefile.am b/Makefile.am index 98a8506..cadcb6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -519,64 +519,7 @@ EXTRA_DIST += \ $(MANPAGES) \ $(MANPAGES_ALIAS) -# -- -noinst_LTLIBRARIES += \ - libsystemd-shared.la - -libsystemd_shared_la_SOURCES = \ - src/shared/linux/auto_dev-ioctl.h \ - src/shared/linux/fanotify.h \ - src/shared/missing.h \ - src/shared/list.h \ - src/shared/macro.h \ - src/shared/def.h \ - src/shared/util.c \ - src/shared/util.h \ - src/shared/virt.c \ - src/shared/virt.h \ - src/shared/path-util.c \ - src/shared/path-util.h \ - src/shared/hashmap.c \ - src/shared/hashmap.h \ - src/shared/set.c \ - src/shared/set.h \ - src/shared/strv.c \ - src/shared/strv.h \ -
[systemd-devel] [PATCH 2/5] build-sys: move udev build to a separate makefile
--- Makefile-udev.am | 690 ++ Makefile.am | 673 + 2 files changed, 692 insertions(+), 671 deletions(-) create mode 100644 Makefile-udev.am diff --git a/Makefile-udev.am b/Makefile-udev.am new file mode 100644 index 000..284f9f5 --- /dev/null +++ b/Makefile-udev.am @@ -0,0 +1,690 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- */ +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see http://www.gnu.org/licenses/. + +LIBUDEV_CURRENT=1 +LIBUDEV_REVISION=1 +LIBUDEV_AGE=0 + +LIBGUDEV_CURRENT=1 +LIBGUDEV_REVISION=1 +LIBGUDEV_AGE=1 + +# -- +if ENABLE_GTK_DOC +SUBDIRS += \ + docs/libudev +endif + +include_HEADERS += \ + src/libudev/libudev.h + +lib_LTLIBRARIES += \ + libudev.la + +libudev_la_SOURCES =\ + src/libudev/libudev-private.h \ + src/libudev/libudev.c \ + src/libudev/libudev-list.c \ + src/libudev/libudev-util.c \ + src/libudev/libudev-device.c \ + src/libudev/libudev-enumerate.c \ + src/libudev/libudev-monitor.c \ + src/libudev/libudev-queue.c + +libudev_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden + +libudev_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym + +libudev_la_LIBADD = \ + libsystemd-shared.la + +pkgconfiglib_DATA += \ + src/libudev/libudev.pc + +EXTRA_DIST += \ + src/libudev/libudev.pc.in \ + src/libudev/libudev.sym + +CLEANFILES += \ + src/libudev/libudev.pc + +# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +libudev-install-move-hook: + if test $(libdir) != $(rootlibdir); then \ + mkdir -p $(DESTDIR)$(rootlibdir) \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') \ + ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so \ + mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \ + fi + +libudev-uninstall-move-hook: + rm -f $(DESTDIR)$(rootlibdir)/libudev.so* + +INSTALL_EXEC_HOOKS += libudev-install-move-hook +UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook + +# -- +noinst_LTLIBRARIES += \ + libudev-private.la + +libudev_private_la_SOURCES =\ + $(libudev_la_SOURCES) \ + src/libudev/libudev-device-private.c \ + src/libudev/libudev-queue-private.c + +libudev_private_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default + +libudev_private_la_LIBADD = \ + libsystemd-shared.la + +# -- +MANPAGES += \ + man/udev.7 \ + man/udevadm.8 \ + man/systemd-udevd.8 + +udev-confdirs: + -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d + +INSTALL_DATA_HOOKS += udev-confdirs + +dist_udevrules_DATA += \ + rules/99-systemd.rules \ + rules/42-usb-hid-pm.rules \ + rules/50-udev-default.rules \ + rules/60-persistent-storage-tape.rules \ + rules/60-persistent-serial.rules \ + rules/60-persistent-input.rules \ + rules/60-persistent-alsa.rules \ + rules/60-persistent-storage.rules \ + rules/75-net-description.rules \ + rules/75-tty-description.rules \ + rules/78-sound-card.rules \ + rules/80-drivers.rules \ + rules/95-udev-late.rules + +udevconfdir = $(sysconfdir)/udev +dist_udevconf_DATA = \ + src/udev/udev.conf + +sharepkgconfigdir = $(datadir)/pkgconfig +sharepkgconfig_DATA = \ + src/udev/udev.pc + +EXTRA_DIST += \ + rules/99-systemd.rules.in \ + src/udev/udev.pc.in + +CLEANFILES += \ + rules/99-systemd.rules \ + src/udev/udev.pc + +EXTRA_DIST += \ + units/systemd-udev.service.in \ + units/systemd-udev-trigger.service.in \ + units/systemd-udev-settle.service.in + +CLEANFILES += \ +
[systemd-devel] [PATCH 4/5] build-sys: add --enable-systemd configure option
---
Makefile.am |9 -
configure.ac |8
2 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e3e1cf1..55ee80a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -238,7 +238,10 @@ SED_PROCESS = \
include Makefile-shared.am
include Makefile-udev.am
+
+if ENABLE_SYSTEMD
include Makefile-systemd.am
+endif
man/%: man/%.in Makefile
$(SED_PROCESS)
@@ -297,7 +300,11 @@ install-exec-hook: $(INSTALL_EXEC_HOOKS)
uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
-install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
+if ENABLE_SYSTEMD
+INSTALL_DATA_HOOKS = systemd-install-data-hook $(INSTALL_DATA_HOOKS)
+endif
+
+install-data-hook: $(INSTALL_DATA_HOOKS)
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
diff --git a/configure.ac b/configure.ac
index e0a2526..dbbb6e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -692,6 +692,13 @@ AS_IF([test x${enable_split_usr} = xyes], [
AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks
into /usr])
])
+have_systemd=no
+AC_ARG_ENABLE(systemd, AS_HELP_STRING([--disable-systemd], [Disable building
systemd]))
+if test x$enable_systemd != xno; then
+have_systemd=yes
+fi
+AM_CONDITIONAL(ENABLE_SYSTEMD, [test $have_systemd = yes])
+
AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
@@ -734,6 +741,7 @@ AC_MSG_RESULT([
timedated: ${have_timedated}
localed: ${have_localed}
coredump:${have_coredump}
+systemd: ${have_systemd}
firmware path: ${FIRMWARE_PATH}
usb.ids: ${USB_DATABASE}
pci.ids: ${PCI_DATABASE}
--
1.7.3.4
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH 5/5] build-sys: add --enable-udev configure option
---
Makefile.am |3 +++
configure.ac |8
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 55ee80a..7cd68d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -237,7 +237,10 @@ SED_PROCESS = \
$ $@ || rm $@
include Makefile-shared.am
+
+if ENABLE_UDEV
include Makefile-udev.am
+endif
if ENABLE_SYSTEMD
include Makefile-systemd.am
diff --git a/configure.ac b/configure.ac
index dbbb6e0..e13eba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -699,6 +699,13 @@ if test x$enable_systemd != xno; then
fi
AM_CONDITIONAL(ENABLE_SYSTEMD, [test $have_systemd = yes])
+have_udev=no
+AC_ARG_ENABLE(udev, AS_HELP_STRING([--disable-udev], [Disable building udev]))
+if test x$enable_udev != xno; then
+have_udev=yes
+fi
+AM_CONDITIONAL(ENABLE_UDEV, [test $have_udev = yes])
+
AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
@@ -742,6 +749,7 @@ AC_MSG_RESULT([
localed: ${have_localed}
coredump:${have_coredump}
systemd: ${have_systemd}
+udev:${have_udev}
firmware path: ${FIRMWARE_PATH}
usb.ids: ${USB_DATABASE}
pci.ids: ${PCI_DATABASE}
--
1.7.3.4
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Re: [systemd-devel] [PATCH] Allow configuring without systemd-only dependencies
On Thu, Jun 07, 2012 at 11:35:00PM -0700, Bryan Kadzban wrote: Some dependencies (intltool, m4, dbus, pkg-config, PAM) are only required or useful for systemd, not for udev. Leave these required by default, but allow them to be made optional if the right flag is used to ./configure. How about using --disable-systemd to take out these dependencies instead of adding another switch? William pgpUyLZ8HrETd.pgp Description: PGP signature ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] breaking up Makefile.am
All, this series of patches will break up Makefile.am into 3 modules which are included by the main Makefile. This is designed to make it possible to enable or disable the udev or systemd portions of the build using configure switches. Currently everything is still built, because there are no configure switches in place. This however is the next phase of this project. [PATCH 1/3] build-sys: move common libraries to separate Makefile [PATCH 2/3] build-sys: move udev build to a separate makefile [PATCH 3/3] build-sys: move systemd build to a separate makefile These are meant to be applied directly to git as of commit 7a5498fe926eb41520c3e4b0e97ff8359ae37e9e. Thanks, William ___ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
[systemd-devel] [PATCH 1/3] build-sys: move common libraries to separate Makefile
--- Makefile-shared.am | 98 +++ Makefile.am| 99 +--- 2 files changed, 99 insertions(+), 98 deletions(-) create mode 100644 Makefile-shared.am diff --git a/Makefile-shared.am b/Makefile-shared.am new file mode 100644 index 000..40dda24 --- /dev/null +++ b/Makefile-shared.am @@ -0,0 +1,98 @@ +# -- +if HAVE_ACL +noinst_LTLIBRARIES += \ + libsystemd-acl.la + +libsystemd_acl_la_SOURCES = \ + src/shared/acl-util.c \ + src/shared/acl-util.h + +libsystemd_acl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(ACL_CFLAGS) + +libsystemd_acl_la_LIBADD = \ + $(ACL_LIBS) +endif + +# -- +noinst_LTLIBRARIES += \ + libsystemd-label.la + +libsystemd_label_la_SOURCES = \ + src/shared/cgroup-label.c \ + src/shared/socket-label.c \ + src/shared/label.c \ + src/shared/label.h \ + src/shared/mkdir.c \ + src/shared/mkdir.h \ + src/shared/ask-password-api.c \ + src/shared/ask-password-api.h \ + src/shared/dev-setup.c \ + src/shared/dev-setup.h + +libsystemd_label_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(SELINUX_CFLAGS) + +libsystemd_label_la_LIBADD = \ + $(SELINUX_LIBS) + +# -- +noinst_LTLIBRARIES += \ + libsystemd-shared.la + +libsystemd_shared_la_SOURCES = \ + src/shared/linux/auto_dev-ioctl.h \ + src/shared/linux/fanotify.h \ + src/shared/missing.h \ + src/shared/list.h \ + src/shared/macro.h \ + src/shared/def.h \ + src/shared/util.c \ + src/shared/util.h \ + src/shared/virt.c \ + src/shared/virt.h \ + src/shared/path-util.c \ + src/shared/path-util.h \ + src/shared/hashmap.c \ + src/shared/hashmap.h \ + src/shared/set.c \ + src/shared/set.h \ + src/shared/strv.c \ + src/shared/strv.h \ + src/shared/conf-parser.c \ + src/shared/conf-parser.h \ + src/shared/log.c \ + src/shared/log.h \ + src/shared/ratelimit.h \ + src/shared/ratelimit.c \ + src/shared/exit-status.c \ + src/shared/exit-status.h \ + src/shared/utf8.c \ + src/shared/utf8.h \ + src/shared/pager.c \ + src/shared/pager.h \ + src/shared/ioprio.h \ + src/shared/socket-util.c \ + src/shared/socket-util.h \ + src/shared/conf-files.c \ + src/shared/conf-files.h \ + src/shared/cgroup-util.c \ + src/shared/cgroup-util.h \ + src/shared/cgroup-show.c \ + src/shared/cgroup-show.h \ + src/shared/unit-name.c \ + src/shared/unit-name.h \ + src/shared/utmp-wtmp.c \ + src/shared/utmp-wtmp.h \ + src/shared/watchdog.c \ + src/shared/watchdog.h \ + src/shared/spawn-ask-password-agent.c \ + src/shared/spawn-ask-password-agent.h \ + src/shared/specifier.c \ + src/shared/specifier.h \ + src/shared/spawn-polkit-agent.c \ + src/shared/spawn-polkit-agent.h \ + src/shared/hwclock.c \ + src/shared/hwclock.h diff --git a/Makefile.am b/Makefile.am index f45fa27..d4bc9eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -519,64 +519,7 @@ EXTRA_DIST += \ $(MANPAGES) \ $(MANPAGES_ALIAS) -# -- -noinst_LTLIBRARIES += \ - libsystemd-shared.la - -libsystemd_shared_la_SOURCES = \ - src/shared/linux/auto_dev-ioctl.h \ - src/shared/linux/fanotify.h \ - src/shared/missing.h \ - src/shared/list.h \ - src/shared/macro.h \ - src/shared/def.h \ - src/shared/util.c \ - src/shared/util.h \ - src/shared/virt.c \ - src/shared/virt.h \ - src/shared/path-util.c \ - src/shared/path-util.h \ - src/shared/hashmap.c \ - src/shared/hashmap.h \ - src/shared/set.c \ - src/shared/set.h \ - src/shared/strv.c \ - src/shared/strv.h \ - src/shared/conf-parser.c \ - src/shared/conf-parser.h \ - src/shared/log.c \ - src/shared/log.h \ - src/shared/ratelimit.h \ - src/shared/ratelimit.c \ - src/shared/exit-status.c \ - src/shared/exit-status.h \ - src/shared/utf8.c \ - src/shared/utf8.h \ - src/shared/pager.c \ - src/shared/pager.h \ - src/shared/ioprio.h \ - src/shared/socket-util.c \ - src/shared/socket-util.h \ - src/shared/conf-files.c \ - src/shared/conf-files.h \ - src/shared/cgroup-util.c \ - src/shared/cgroup-util.h \ - src/shared/cgroup-show.c \ - src/shared/cgroup-show.h \ - src/shared/unit-name.c \ - src/shared/unit-name.h \
[systemd-devel] [PATCH 2/3] build-sys: move udev build to a separate makefile
--- Makefile-udev.am | 671 + Makefile.am | 675 +- 2 files changed, 674 insertions(+), 672 deletions(-) create mode 100644 Makefile-udev.am diff --git a/Makefile-udev.am b/Makefile-udev.am new file mode 100644 index 000..b8b5f63 --- /dev/null +++ b/Makefile-udev.am @@ -0,0 +1,671 @@ +LIBUDEV_CURRENT=1 +LIBUDEV_REVISION=1 +LIBUDEV_AGE=0 + +LIBGUDEV_CURRENT=1 +LIBGUDEV_REVISION=1 +LIBGUDEV_AGE=1 + +# -- +if ENABLE_GTK_DOC +SUBDIRS += \ + docs/libudev +endif + +include_HEADERS += \ + src/libudev/libudev.h + +lib_LTLIBRARIES += \ + libudev.la + +libudev_la_SOURCES =\ + src/libudev/libudev-private.h \ + src/libudev/libudev.c \ + src/libudev/libudev-list.c \ + src/libudev/libudev-util.c \ + src/libudev/libudev-device.c \ + src/libudev/libudev-enumerate.c \ + src/libudev/libudev-monitor.c \ + src/libudev/libudev-queue.c + +libudev_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden + +libudev_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym + +libudev_la_LIBADD = \ + libsystemd-shared.la + +pkgconfiglib_DATA += \ + src/libudev/libudev.pc + +EXTRA_DIST += \ + src/libudev/libudev.pc.in \ + src/libudev/libudev.sym + +CLEANFILES += \ + src/libudev/libudev.pc + +# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +libudev-install-move-hook: + if test $(libdir) != $(rootlibdir); then \ + mkdir -p $(DESTDIR)$(rootlibdir) \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') \ + ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so \ + mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \ + fi + +libudev-uninstall-move-hook: + rm -f $(DESTDIR)$(rootlibdir)/libudev.so* + +INSTALL_EXEC_HOOKS += libudev-install-move-hook +UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook + +# -- +noinst_LTLIBRARIES += \ + libudev-private.la + +libudev_private_la_SOURCES =\ + $(libudev_la_SOURCES) \ + src/libudev/libudev-device-private.c \ + src/libudev/libudev-queue-private.c + +libudev_private_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default + +libudev_private_la_LIBADD = \ + libsystemd-shared.la + +# -- +MANPAGES += \ + man/udev.7 \ + man/udevadm.8 \ + man/systemd-udevd.8 + +udev-confdirs: + -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d + -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices + +INSTALL_DATA_HOOKS += udev-confdirs + +dist_udevrules_DATA += \ + rules/99-systemd.rules \ + rules/42-usb-hid-pm.rules \ + rules/50-udev-default.rules \ + rules/60-persistent-storage-tape.rules \ + rules/60-persistent-serial.rules \ + rules/60-persistent-input.rules \ + rules/60-persistent-alsa.rules \ + rules/60-persistent-storage.rules \ + rules/75-net-description.rules \ + rules/75-tty-description.rules \ + rules/78-sound-card.rules \ + rules/80-drivers.rules \ + rules/95-udev-late.rules + +udevconfdir = $(sysconfdir)/udev +dist_udevconf_DATA = \ + src/udev/udev.conf + +sharepkgconfigdir = $(datadir)/pkgconfig +sharepkgconfig_DATA = \ + src/udev/udev.pc + +EXTRA_DIST += \ + rules/99-systemd.rules.in \ + src/udev/udev.pc.in + +CLEANFILES += \ + rules/99-systemd.rules \ + src/udev/udev.pc + +EXTRA_DIST += \ + units/systemd-udev.service.in \ + units/systemd-udev-trigger.service.in \ + units/systemd-udev-settle.service.in + +CLEANFILES += \ + units/systemd-udev.service \ + units/systemd-udev-trigger.service \ + units/systemd-udev-settle.service + +systemd-install-hook: + mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants + ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket + ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket + mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants + ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service + ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service + +INSTALL_DATA_HOOKS +=
