ppcrcd/trunk: Makefile boot.dir/pld.hlp boot.dir/yaboot.cfg.in boot.dir/yaboot.cfg.net.in

[sparky]

Author: sparky
Date: Thu Mar 16 17:55:07 2006
New Revision: 7198

Modified:
   ppcrcd/trunk/Makefile
   ppcrcd/trunk/boot.dir/pld.hlp
   ppcrcd/trunk/boot.dir/yaboot.cfg.in
   ppcrcd/trunk/boot.dir/yaboot.cfg.net.in
Log:
- autogenerate yaboot documentation


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Thu Mar 16 17:55:07 2006
@@ -13,6 +13,7 @@
 	-fno-prefetch-loop-arrays -fno-tree-vect-loop-version
 
 DOCSRC	= index AirPort2 chrp images netbooting opts progs usb_boot
+YDOCSRC	= images opts
 
 R = out/rpm/rpms
 P = out/rpm/prep
@@ -41,6 +42,7 @@
 INSTALL = $(addprefix out/rpm/installed/,$(I))
 POST_ = $(addprefix $(touch)/,$(POST))
 DOCS = $(addprefix out/docs/,$(addsuffix .html,$(DOCSRC)))
+YDOCS = $(addprefix out/docs/,$(addsuffix .hlp,$(YDOCSRC)))
 
 $(ppcrcd_iso):	$(cdroot) $(boot)/hfs.map files.sort
 	$(SU) mkisofs \
@@ -122,10 +124,11 @@
 	done
 	sleep 1 && touch $@
 
-$(boot):	out/touch/root_installed $(vmlinuz) yaboot/yaboot boot.dir
+$(boot):	out/touch/root_installed $(vmlinuz) yaboot/yaboot boot.dir $(YDOCS)
 	rm -rf $@{,.work}
 	mkdir -p $@.work
 	cp boot.dir/{hfs.map,boot.msg{,.net},*.hlp,prep-tftp-files.sh} $@.work
+	cp $(YDOCS) $@.work
 	$(PWD)/fill_conf.pl $(vmlinuz) out/images/vmlinux.bin{.gz,} $(initrd_sqf) \
 		boot.dir/yaboot.cfg.in > $@.work/yaboot.cfg
 	$(PWD)/fill_conf.pl $(vmlinuz) out/images/vmlinux.bin{.gz,} $(initrd_sqf) \
@@ -266,6 +269,9 @@
 	@mkdir -p out/docs
 	cat $< > $@
 
+out/docs/%.hlp:	out/docs/%.html
+	elinks -dump $< > $@
+
 out/rpm/SPECS/%.spec: out/touch/builder_prepared
 	cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
 		$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)

Modified: ppcrcd/trunk/boot.dir/pld.hlp
==============================================================================
--- ppcrcd/trunk/boot.dir/pld.hlp	(original)
+++ ppcrcd/trunk/boot.dir/pld.hlp	Thu Mar 16 17:55:07 2006
@@ -1,8 +1,7 @@
 help options, type one of those, or press number to get more help:
 
-  images (2) - kernel image aliases
-  opts1  (3) - first part of kernel options
-  opts2  (4) - second part of kernel options
+  images  (2) - kernel image aliases
+  options (3) - kernel options
 
 other help:
   ide - ide.txt from kernel documentation

Modified: ppcrcd/trunk/boot.dir/yaboot.cfg.in
==============================================================================
--- ppcrcd/trunk/boot.dir/yaboot.cfg.in	(original)
+++ ppcrcd/trunk/boot.dir/yaboot.cfg.in	Thu Mar 16 17:55:07 2006
@@ -17,16 +17,11 @@
 	alias=2
 	single-key
 
-text=/boot/options1.hlp
-	label=opts1
+text=/boot/opts.hlp
+	label=options
 	alias=3
 	single-key
 
-text=/boot/options2.hlp
-	label=opts2
-	alias=4
-	single-key
-
 text=/boot/ide.hlp
 	label=ide
 

Modified: ppcrcd/trunk/boot.dir/yaboot.cfg.net.in
==============================================================================
--- ppcrcd/trunk/boot.dir/yaboot.cfg.net.in	(original)
+++ ppcrcd/trunk/boot.dir/yaboot.cfg.net.in	Thu Mar 16 17:55:07 2006
@@ -17,16 +17,11 @@
 	alias=2
 	single-key
 
-text=/boot/options1.hlp
-	label=opts1
+text=/boot/opts.hlp
+	label=options
 	alias=3
 	single-key
 
-text=/boot/options2.hlp
-	label=opts2
-	alias=4
-	single-key
-
 text=/boot/ide.hlp
 	label=ide