On 06/01/2016 11:19 PM, Bruce Dubbs wrote:
DJ Lucas wrote:
On 06/01/2016 02:19 PM, Bruce Dubbs wrote:
OK, I've committed the changes to the Makefile to support the merge. I
checked the daily update script for trunk and it is good, so just start
adding revision= attributes and it should still be good.
We still will generate the systemd book from the branch for a while so
updates to both trunk and one branch will be needed until we are ready
to stop using the branch.
Okay, FYI, you'll need to clear ~/tmp (or make clean) when generating
both
books. Fairly simple fix...I think. Also, no units (equivalent for
bootscripts) for systemd yet. Please review attached patch. AFAICT, no
ill
effects, but a second set of eyes would be much appreciated.
OK, but for clean, how about
clean:
@echo "Cleaning $(RENDERTMP)"
$(Q)rm -f $(RENDERTMP)/blfs*
Actually even that is a little problematic if the user overrides the
BLFS* variables. Using those doesn't help either because the BLFS* vars
do not have to be the same every time. The only real way to make sure
the director is clean is to use 'rm -f $(RENDERTMP)/*'
I'd rather only clean the files we create. Who knows if somebody else
uses ~/tmp. I originally used the variables, but that means REV has to
be set to get the alternates. We really can't do anything if the user
changes the value of those variables. I'm okay with blfs* as that still
handles the case of building both books one after the other (first pass
isn't skipped). Also, after thinking about it a bit, is there any way
that it makes sense to depend on $REV for the bootscripts and
systemd-units tarballs? We don't do automated md5sum updates AFAICT, and
they haven't been dependencies of the all or blfs targets for several
years IIRC.
--DJ
--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
