International root disks split
Hi,
I have tried to do a patch to produce extra root disk images in order to
support all translated languages on floppies. It extends rootdisk.sh
with one more optional parameter to override the contents of $langs_root
and tries to produce extra "-int2" root images with another set of
languages in LC.
I have not worked with makefiles before and find the makefiles of b-f
very confusing.
The following patch succeeds in producing root.bin and root-int2.bin
(with two different sets of languages) as well a similar
rootrescue-int2.bin, rootcompact-int2.bin otc.
But how do I get e.g. root1440-int2.bin and root1440compact-int2.bin
created?? Can anybody help me out?
Claus
Index: config
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/config,v
retrieving revision 1.140
diff -u -r1.140 config
--- config 2002/03/05 19:41:32 1.140
+++ config 2002/03/06 16:02:59
@@ -130,9 +130,12 @@
export langs_root := en ca cs da de eo es fi fr gl hr hu it ja pl pt ru sk sv tr
else
ifeq ($(architecture),powerpc)
- export langs_root := en pt de pl fr es ja sv
+ export langs_root := en pt de it fr es ja ru
+ export langs_root2 := en ca da eo gl hu pl sv
+ export langs_root3 := en sk cs fi tr hr
else
- export langs_root := en pt de pl fr es ja sv it hu ca
+ export langs_root := en pt de pl fr es ja sv it hu ru
+ export langs_root2 := en ca cs da eo fi gl hr sk tr
endif
endif
endif
Index: rootdisk.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/rootdisk.sh,v
retrieving revision 1.345
diff -u -r1.345 rootdisk.sh
--- rootdisk.sh 2002/03/06 14:42:07 1.345
+++ rootdisk.sh 2002/03/06 16:03:00
@@ -25,7 +25,7 @@
umask 022
if [ $# -lt 6 ]; then
- echo "Usage: $0 revision-extension archive blocks debian-version system language [font sfont]" 1>&2
+ echo "Usage: $0 revision-extension archive blocks debian-version system language [font sfont langs_root]" 1>&2
cat 1>&2 << EOF
revision-extension: the revision extension of the kernel
@@ -36,6 +36,7 @@
language: language for the release notes
font: name of the preloaded font, if any
sfont: name of the font loaded by syslinux, if any
+ langs_root: list of languages to include for language chooser e.g. "en de fr"
EOF
exit -1
@@ -63,6 +64,11 @@
# Set this to the font loaded by syslinux, if any.
sfont=$8
+
+# Overrides langs_root for language chooser, if any.
+if [ -n "$9" ]; then
+ langs_root="$9"
+fi
# This is the directory containing fonts.
fontsdir=usr/share/consolefonts
Index: make/i386.rules
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/make/i386.rules,v
retrieving revision 1.10
diff -u -r1.10 i386.rules
--- make/i386.rules 2002/02/26 17:28:12 1.10
+++ make/i386.rules 2002/03/06 16:03:00
@@ -16,13 +16,42 @@
##
rootidepci.bin: rootdisk.sh modulesidepci.tgz keymaps.tgz $(arch_rootdisk_deps) $(rootlinguadep)
- $(ROOTCMD) ./rootdisk.sh "idepci" $(archive) $(root_bin_size) $(debianversion) "" $(LINGUA) "$(FONT)" $(SFONT)
+ $(ROOTCMD) ./rootdisk.sh "idepci" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root)"
+ifdef langs_root2
+ $(ROOTCMD) ./rootdisk.sh "idepci-int2" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root2)"
+endif
+ifdef langs_root3
+ $(ROOTCMD) ./rootdisk.sh "idepci-int3" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root3)"
+endif
+
+
rootcompact.bin: rootdisk.sh modulescompact.tgz keymaps.tgz $(arch_rootdisk_deps) $(rootlinguadep)
- $(ROOTCMD) ./rootdisk.sh "compact" $(archive) $(root_bin_size) $(debianversion) "" $(LINGUA) "$(FONT)" $(SFONT)
+ $(ROOTCMD) ./rootdisk.sh "compact" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root)"
+ifdef langs_root2
+ $(ROOTCMD) ./rootdisk.sh "compact-int2" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root2)"
+endif
+ifdef langs_root3
+ $(ROOTCMD) ./rootdisk.sh "compact-int3" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root3)"
+endif
rootbf2.4.bin: rootdisk.sh modulesbf2.4.tgz keymaps.tgz $(arch_rootdisk_deps) $(rootlinguadep)
- $(ROOTCMD) ./rootdisk.sh "bf2.4" $(archive) $(root_bin_size) $(debianversion) "" $(LINGUA) "$(FONT)" $(SFONT)
+ $(ROOTCMD) ./rootdisk.sh "bf2.4" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root)"
+ifdef langs_root2
+ $(ROOTCMD) ./rootdisk.sh "bf2.4-int2" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root2)"
+endif
+ifdef langs_root3
+ $(ROOTCMD) ./rootdisk.sh "bf2.4-int3" $(archive) $(root_bin_size) $(debianversion) \
+ "" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root3)"
+endif
##
## checks
@@ -43,3 +72,4 @@
resc2880bf2.4.bin: rootbf2.4.bin linuxbf2.4 rescue.sh $(arch_rescue_deps)
$(ROOTCMD) ./rescue.sh $(archive) "bf2.4" $(kver_24) $< \
2880 $(debianversion) "" $(LINGUA) $(SFONT)
+
Index: make/root
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/make/root,v
retrieving revision 1.18
diff -u -r1.18 root
--- make/root 2002/02/26 11:16:25 1.18
+++ make/root 2002/03/06 16:03:00
@@ -31,14 +31,31 @@
##
root.bin: rootdisk.sh modules.tgz keymaps.tgz $(arch_rootdisk_deps) $(rootlinguadep)
- $(ROOTCMD) ./rootdisk.sh "" $(archive) $(root_bin_size) $(debianversion) "$*" $(LINGUA) "$(FONT)" $(SFONT)
+ $(ROOTCMD) ./rootdisk.sh "" $(archive) $(root_bin_size) $(debianversion) \
+ "$*" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root)"
+ifdef langs_root2
+ $(ROOTCMD) ./rootdisk.sh "-int2" $(archive) $(root_bin_size) $(debianversion) \
+ "$*" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root2)"
+endif
+ifdef langs_root3
+ $(ROOTCMD) ./rootdisk.sh "-int3" $(archive) $(root_bin_size) $(debianversion) \
+ "$*" $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root3)"
+endif
rootmini.bin: rootdisk.sh modulesidepci.tgz keymaps.tgz $(arch_rootdisk_deps) $(rootlinguadep)
i18n_low_space=true $(ROOTCMD) ./rootdisk.sh "" $(archive) $(root_bin_size) $(debianversion) "" $(LINGUA) "$(FONT)" $(SFONT)
root%.bin: rootdisk.sh modules%.tgz keymaps.tgz $(arch_rootdisk_deps) $(rootlinguadep)
- $(ROOTCMD) ./rootdisk.sh "" $(archive) $(root_bin_size) $(debianversion) "$*" $(LINGUA) "$(FONT)" $(SFONT)
-
+ $(ROOTCMD) ./rootdisk.sh "" $(archive) $(root_bin_size) $(debianversion) "$*" \
+ $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root)"
+ifdef langs_root2
+ $(ROOTCMD) ./rootdisk.sh "" $(archive) $(root_bin_size) $(debianversion) "$*" \
+ $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root2)"
+endif
+ifdef langs_root3
+ $(ROOTCMD) ./rootdisk.sh "" $(archive) $(root_bin_size) $(debianversion) "$*" \
+ $(LINGUA) "$(FONT)" "$(SFONT)" "$(langs_root3)"
+endif
#-----------------------------------------------------------------------------
# netboot
Reply to: