#include <hallo.h> Eduard Bloch wrote on Mon Feb 25, 2002 um 09:35:38AM:
> Now, I am going to make modifications to make locales work in modconf > again. I see a serious problem: ldd does not find any references to libslang.so.1, but ld-linux does. Any ideas? In the attached patch are changes that I made so far. LC is hard-wired with LANG_CHOOSER. Gruss/Regards, Eduard. -- Profitip No. 413: Zeit sparen durch Rebooten im Hintergrund. Man will ja nicht jedesmal die Arbeit unterbrechen... > reboot &
? bla ? boot.iso ? bootbf2.4.iso ? build-03.02.2002 ? build-21.01.2001 ? build-23.01.2001 ? build-25.01.2001 ? build-28.01.2001 ? cvs-diff.txt ? diff ? make-iso.sh ? mod-diff.txt ? nano-bf_1.1.6-2.dsc ? nano-bf_1.1.6-2.tar.gz ? nano-bf_1.1.6-2_i386.deb ? nano-utf8_1.1.6-2.dsc ? nano-utf8_1.1.6-2.tar.gz ? nano_1.1.6-1.diff.gz ? nano_1.1.6-1.dsc ? nano_1.1.6.orig.tar.gz ? rootbf2.4.bin.hacked ? utilities/a.out ? utilities/libfdtest.c ? utilities/dbootstrap/a.out ? utilities/dbootstrap/choose_medium.c_ ? utilities/dbootstrap/cvs-diff.txt ? utilities/dbootstrap/extract_base.c.my_patched Index: config =================================================================== RCS file: /cvs/debian-boot/boot-floppies/config,v retrieving revision 1.133 diff -u -r1.133 config --- config 2002/02/25 08:59:27 1.133 +++ config 2002/02/25 10:43:35 @@ -74,7 +74,7 @@ # Top-level directory where we will look for external stuff required # to build the boot-floppies. It has to be an absolute PATH or else # the basedisks.sh script will fail. -ftp_archive := /archive/debian +ftp_archive := /var/tmp/archive/debian # files from Incoming; note they must be named *_all.deb or *_<arch>.deb incoming := $(ftp_archive)/Incoming @@ -93,7 +93,7 @@ ## ## Debian mirror we can download from, must be http://, ftp:// or file:// ## -export MIRRORS := http://http.us.debian.org/debian +export MIRRORS := http://ftp.uni-kl.de/pub/linux/debian ## ## How to achieve root @@ -109,8 +109,10 @@ # support it, `true' or `false' ifneq (,$(filter $(architecture),i386 arm powerpc alpha)) export USE_LANGUAGE_CHOOSER := true + export LC := true else export USE_LANGUAGE_CHOOSER := false + export LC := true endif # list of all available languages Index: rootdisk.sh =================================================================== RCS file: /cvs/debian-boot/boot-floppies/rootdisk.sh,v retrieving revision 1.330 diff -u -r1.330 rootdisk.sh --- rootdisk.sh 2002/02/11 11:04:50 1.330 +++ rootdisk.sh 2002/02/25 10:43:36 @@ -80,18 +80,18 @@ # turn LC on for kernels with framebuffer support if [ "$USE_LANGUAGE_CHOOSER" = "true" ]; then - if [ "$arch" = "i386" ] && \ - [ "$revext" != "compact" -a "$revext" != "idepci" -a "$revext" != "bf2.4-compact" -a "$revext" != "bf2.4" ]; then - info "single locale mode forced for flavor '$revext', no FB console support" - elif [ "$arch" = "i386" -o "$arch" = "arm" -o "$arch" = "powerpc" -o "$arch" = "alpha" ]; then - info "internationalized mode enabled" +# if [ "$arch" = "i386" ] && \ +# [ "$revext" != "compact" -a "$revext" != "idepci" -a "$revext" != +"bf2.4-compact" -a "$revext" != "bf2.4" ]; then +# info "single locale mode forced for flavor '$revext', no FB console support" +# elif [ "$arch" = "i386" -o "$arch" = "arm" -o "$arch" = "powerpc" -o "$arch" = +"alpha" ]; then +# info "internationalized mode enabled" ROOT_IS_I18N=true # add other arch support here, some arches may need to disable it - else - info "internationalization mode disabled on this architecture" - fi -else - info "single locale mode (USE_LANGUAGE_CHOOSER = false)" +# else +# info "internationalization mode disabled on this architecture" +# fi +#else +# info "single locale mode (USE_LANGUAGE_CHOOSER = false)" fi # must be root @@ -266,6 +266,8 @@ dpkg-deb --extract $i $E done +test -x $E/sbin/cfdisk-utf8 && mv $E/sbin/cfdisk-utf8 $E/sbin/cfdisk + info "stripping executables in extract area" $scripts/strip_executables.sh $E/bin/* $E/usr/bin/* $E/sbin/* $E/usr/sbin/* $E/lib/* $E/usr/lib/* @@ -575,6 +577,8 @@ awk -v E="^$E" -v L="/lib/$ldlib" -- '$3=="not" {print $1; next}; \ ($3!~E) && ($1!~L) {print $3}' | grep -v "dynamic" | \ sort -u` + +echo WTF: `( for i in $EXECUTABLES; do $E/lib/$ldlib --library-path $E/lib:$E/usr/lib +--list $i 2>/dev/null; done )` # ld-linux.so.2 is always linked with its full path, so ldd won't look # for it under $E. We have to do it 'by hand' Index: make/root =================================================================== RCS file: /cvs/debian-boot/boot-floppies/make/root,v retrieving revision 1.16 diff -u -r1.16 root --- make/root 2001/11/20 20:12:08 1.16 +++ make/root 2002/02/25 10:43:37 @@ -19,9 +19,9 @@ # language dependancy ifeq ($(USE_LANGUAGE_CHOOSER),true) rootlinguadep = utilities/dbootstrap/po/all-utf utilities/dbootstrap/dbootstrap-lc utilities/dbootstrap/po/C.trm -ifeq ($(architecture),i386) -rootlinguadep += utilities/dbootstrap/po/$(LINGUA).trm utilities/dbootstrap/dbootstrap -endif +#ifeq ($(architecture),i386) +#rootlinguadep += utilities/dbootstrap/po/$(LINGUA).trm +utilities/dbootstrap/dbootstrap +#endif else rootlinguadep = utilities/dbootstrap/po/$(LINGUA).trm utilities/dbootstrap/dbootstrap endif Index: scripts/rootdisk/EXTRACT_LIST_all =================================================================== RCS file: /cvs/debian-boot/boot-floppies/scripts/rootdisk/EXTRACT_LIST_all,v retrieving revision 1.47 diff -u -r1.47 EXTRACT_LIST_all --- scripts/rootdisk/EXTRACT_LIST_all 2002/01/30 13:47:15 1.47 +++ scripts/rootdisk/EXTRACT_LIST_all 2002/02/25 10:43:39 @@ -8,6 +8,4 @@ libpopt0 makedev modutils -nano-tiny netbase -whiptail 0.50.17-9 Index: scripts/rootdisk/EXTRACT_LIST_i18n =================================================================== RCS file: /cvs/debian-boot/boot-floppies/scripts/rootdisk/EXTRACT_LIST_i18n,v retrieving revision 1.5 diff -u -r1.5 EXTRACT_LIST_i18n --- scripts/rootdisk/EXTRACT_LIST_i18n 2001/12/18 15:08:36 1.5 +++ scripts/rootdisk/EXTRACT_LIST_i18n 2002/02/25 10:43:39 @@ -1,3 +1,6 @@ bogl-bterm 0.1.8-1 libnewt-utf8-0 0.50.17-9 -slang1-utf8 +slang1a-utf8 +cfdisk-utf8 +nano-tiny-utf8 +whiptail-utf8 Index: scripts/rootdisk/EXTRACT_LIST_non-i18n =================================================================== RCS file: /cvs/debian-boot/boot-floppies/scripts/rootdisk/EXTRACT_LIST_non-i18n,v retrieving revision 1.3 diff -u -r1.3 EXTRACT_LIST_non-i18n --- scripts/rootdisk/EXTRACT_LIST_non-i18n 2001/12/18 15:08:36 1.3 +++ scripts/rootdisk/EXTRACT_LIST_non-i18n 2002/02/25 10:43:39 @@ -1,2 +1,4 @@ libnewt0 0.50.17-9 slang1 +nano-tiny +whiptail 0.50.17-9 Index: utilities/dbootstrap/Makefile =================================================================== RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/Makefile,v retrieving revision 1.105 diff -u -r1.105 Makefile --- utilities/dbootstrap/Makefile 2002/02/22 16:34:20 1.105 +++ utilities/dbootstrap/Makefile 2002/02/25 10:43:40 @@ -17,7 +17,7 @@ # These are the default values: DEBUG ?= false SMALL ?= true -LC ?= false +LC = $(USE_LANGUAGE_CHOOSER) FB ?= false EFENCE ?= false POINTERIZE ?= true Index: utilities/dbootstrap/main.c =================================================================== RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/main.c,v retrieving revision 1.141 diff -u -r1.141 main.c --- utilities/dbootstrap/main.c 2002/02/03 20:57:40 1.141 +++ utilities/dbootstrap/main.c 2002/02/25 10:43:41 @@ -1,3 +1,4 @@ +#define _TESTING_ 1 #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -12,6 +13,7 @@ # define RB_AUTOBOOT 1 void reboot(int blah){} #endif +#undef _TESTING_ #include <sys/types.h> #include <sys/utsname.h> #include <fcntl.h> Index: utilities/dbootstrap/langs/Makefile =================================================================== RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/langs/Makefile,v retrieving revision 1.25 diff -u -r1.25 Makefile --- utilities/dbootstrap/langs/Makefile 2002/01/06 22:26:19 1.25 +++ utilities/dbootstrap/langs/Makefile 2002/02/25 10:43:41 @@ -3,15 +3,16 @@ architecture ?= i386 +CFLAGS=-Wall -g +LDFLAGS=-g #-ldmalloc -pg + # make parameters... ifeq ($(USE_LANGUAGE_CHOOSER),true) HAVE_UTF_CONSOLE=true +CFLAGS += -DUTF8 else HAVE_UTF_CONSOLE=false endif - -CFLAGS=-Wall -g -LDFLAGS=-g #-ldmalloc -pg UTF_BASE=../../bf-utf Index: utilities/dbootstrap/po/sv.po =================================================================== RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/po/sv.po,v retrieving revision 1.94 diff -u -r1.94 sv.po --- utilities/dbootstrap/po/sv.po 2002/02/23 10:02:04 1.94 +++ utilities/dbootstrap/po/sv.po 2002/02/25 10:43:44 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: dbootstrap 3.0.20\n" -"POT-Creation-Date: 2002-02-23 10:02+0100\n" +"POT-Creation-Date: 2002-02-24 22:24+0100\n" "PO-Revision-Date: 2002-02-17 11:10+0100\n" "Last-Translator: peter karlsson <[EMAIL PROTECTED]>\n" "Language-Team: Debian i18n <[EMAIL PROTECTED]>\n" @@ -79,8 +79,8 @@ #: bootconfig.c:2603 bootconfig.c:2659 bootconfig.c:2668 bootconfig.c:2675 #: bootconfig.c:2683 bootconfig.c:2690 bootconfig.c:2697 bootconfig.c:2705 #: bootconfig.c:2712 bootconfig.c:2720 floppy_modules.c:159 -#: floppy_modules.c:223 floppy_modules.c:422 kbdconfig.c:294 main.c:873 -#: main.c:884 main.c:908 main_menu.c:265 net-fetch.c:577 net-fetch.c:597 +#: floppy_modules.c:223 floppy_modules.c:422 kbdconfig.c:294 main.c:875 +#: main.c:886 main.c:910 main_menu.c:265 net-fetch.c:577 net-fetch.c:597 #: netconfig.c:183 netconfig.c:246 netconfig.c:294 netconfig.c:297 #: netconfig.c:300 netconfig.c:303 netconfig.c:335 netconfig.c:483 #: partition_config.c:94 partition_config.c:482 partition_config.c:635 @@ -1050,7 +1050,7 @@ "Forts�tta?" #: bootconfig.c:2451 extract_base.c:160 extract_base.c:260 extract_base.c:264 -#: floppy_modules.c:151 main.c:933 +#: floppy_modules.c:151 main.c:935 msgid "Warning" msgstr "Varning" @@ -2773,40 +2773,40 @@ msgid "Error loading the keymap %s%s.kmap from /etc/keymaps.tgz" msgstr "Fel vid laddning av tangentbordslayout %s%s.kmap fr�n /etc/keymaps.tgz" -#: main.c:63 +#: main.c:65 #, c-format msgid "Cannot open %s: %s\n" msgstr "Kan inte �ppna %s: %s\n" -#: main.c:200 +#: main.c:202 msgid "m68k machine type unknown!\n" msgstr "m68k-maskintyp ok�nd!\n" -#: main.c:204 +#: main.c:206 msgid "Unable to determine m68k machine type!\n" msgstr "Kunde inte best�mma m68k-maskintyp!\n" -#: main.c:233 +#: main.c:235 msgid "PowerPC machine type unknown!\n" msgstr "PowerPC-maskintyp ok�nd!\n" -#: main.c:237 +#: main.c:239 msgid "Unable to determine PowerPC machine type!\n" msgstr "Kunde inte best�mma PowerPC-maskintyp!\n" -#: main.c:365 +#: main.c:367 msgid "ARM machine type unknown!\n" msgstr "ARM-maskintyp ok�nd!\n" -#: main.c:873 +#: main.c:875 msgid "Your m68k architecture is not supported yet." msgstr "Din m68k-h�rdvara st�ds inte �n." -#: main.c:884 +#: main.c:886 msgid "Your PowerPC architecture is not supported yet." msgstr "Din PowerPC-h�rdvara st�ds inte �n." -#: main.c:908 main_menu.c:263 +#: main.c:910 main_menu.c:263 msgid "" "I had trouble checking the choice of root device. I don't know what to use " "as the root fs." @@ -2814,7 +2814,7 @@ "Problem med att kontrollera valet av rotfilsystem. Vet inte vad som skall " "anv�ndas som rotfilsystem" -#: main.c:927 +#: main.c:929 msgid "" "This machine seems to be using an old StrongARM CPU. SA-110\n" "processors prior to revision S suffered from bugs that will prevent\n" @@ -2833,7 +2833,7 @@ "\n" "F�r mer information, se http://www.armlinux.org/strongarm.html\n"; -#: main.c:959 +#: main.c:961 #, c-format msgid "" "Your computer seems to have only %dMB of RAM. For this\n" @@ -2842,7 +2842,7 @@ "Din dator verkar bara ha %dMbyte RAM. F�r denna version\n" "av Debian rekommenderas minst %dMbyte.\n" -#: main.c:962 +#: main.c:964 msgid "Warning: Low Memory" msgstr "Varning: Ont om minne"
