DJ Lucas wrote: > On 06/03/2012 02:03 PM, Bruce Dubbs wrote: >> Bryan, I tried the patch you submitted to linux-hotplug yesterday: >> >> systemd-make-systemd-optional.patch >> >> It doesn't apply cleanly to either systemd-183 or -184. > > It applies with offsets to git master...which hopefully soon will be > -185. > > git://anongit.freedesktop.org/systemd/systemd
Yup, since I was sending it upstream, I figured it'd be better to base it off current git, instead of any particular release. (And on Friday I found that something went into git that caused the hunk failure you're seeing, though it happened in the other direction for me at the time: http://cgit.freedesktop.org/systemd/systemd/commit/?id=01cf0ca850dd1c21e1c405a4493fe61d0c28d721) I'm sending a new patch soon that fixes "make dist", as well. Note that the directory overrides I mentioned are no longer required at install time either, as long as Makefile.in was generated from Makefile.am using automake-1.11.4 or newer (including 1.11.5, 1.12, and 1.12.1). My system still has one of the older .11 releases.
signature.asc
Description: OpenPGP digital signature
-- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
