Author: sparky
Date: Tue Feb 28 23:46:57 2006
New Revision: 7055
Modified:
ppcrcd/trunk/Makefile
Log:
- stop all services in only one rule
Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile (original)
+++ ppcrcd/trunk/Makefile Tue Feb 28 23:46:57 2006
@@ -37,7 +37,6 @@
sources = out/rpm/sources
INSTALL = $(addprefix out/rpm/installed/,$(I))
-STOP = $(addprefix $(touch)/stop/,$(S))
POST_ = $(addprefix $(touch)/,$(POST))
$(ppcrcd_iso): $(cdroot) $(boot)/hfs.map files.sort
@@ -70,7 +69,7 @@
ln -s $(PWD)/bootinfo.txt [EMAIL PROTECTED]/ppc
mv -f [EMAIL PROTECTED],}
-$(ppcrcd_sqf): $(root_stripped) $(STOP) $(POST_) $(touch)/pld-release
+$(ppcrcd_sqf): $(root_stripped) $(touch)/stop-services $(POST_)
$(touch)/pld-release
rm -f $@
$(SU) /usr/sbin/mksquashfs_lzma \
$(root_stripped) \
@@ -113,9 +112,11 @@
$(SU) tee $(root_stripped)/etc/pld-release
sleep 1 && touch $@
-$(touch)/stop/%: $(root_stripped)
- $(SU) chroot $(root_stripped) chkconfig --level 2345 \
- $(@:out/touch/stop/%=%) off
+$(touch)/stop-services: $(root_stripped)
+ for SERVICE in $(S); do \
+ $(SU) chroot $(root_stripped) chkconfig --level 2345 \
+ $$SERVICE off; \
+ done
sleep 1 && touch $@
$(boot): out/touch/root_installed $(vmlinuz) yaboot/yaboot boot.dir
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
