[Ipcop-svn] SF.net SVN: ipcop: [1014] ipcop/trunk

[<ow...@us...>]

Revision: 1014
          http://ipcop.svn.sourceforge.net/ipcop/?rev=1014&view=rev
Author:   owes
Date:     2008-01-21 13:38:06 -0800 (Mon, 21 Jan 2008)

Log Message:
-----------
Add kernel modules from kernel/lib. via-velocity depends on crc-ccitt
Do not create install.mo files for languages that are not used in installer

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/ipcop-lang
    ipcop/trunk/lfs/initramfs
    ipcop/trunk/lfs/ipcop-lang

Modified: ipcop/trunk/config/rootfiles/common/ipcop-lang
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-lang	2008-01-19 11:39:52 UTC (rev 1013)
+++ ipcop/trunk/config/rootfiles/common/ipcop-lang	2008-01-21 21:38:06 UTC (rev 1014)
@@ -3,11 +3,11 @@
 #
 #var/ipcop/addon-lang
 usr/lib/locale/
-usr/share/locale/af_ZA/LC_MESSAGES/install.mo
+#usr/share/locale/af_ZA/LC_MESSAGES/install.mo
 usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
-usr/share/locale/bg_BG/LC_MESSAGES/install.mo
+#usr/share/locale/bg_BG/LC_MESSAGES/install.mo
 usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo
-usr/share/locale/ca_ES/LC_MESSAGES/install.mo
+#usr/share/locale/ca_ES/LC_MESSAGES/install.mo
 usr/share/locale/ca_ES/LC_MESSAGES/ipcop.mo
 usr/share/locale/cs_CZ/LC_MESSAGES/install.mo
 usr/share/locale/cs_CZ/LC_MESSAGES/ipcop.mo
@@ -23,21 +23,21 @@
 usr/share/locale/es_ES/LC_MESSAGES/ipcop.mo
 usr/share/locale/es_UY/LC_MESSAGES/install.mo
 usr/share/locale/es_UY/LC_MESSAGES/ipcop.mo
-usr/share/locale/fa_IR/LC_MESSAGES/install.mo
+#usr/share/locale/fa_IR/LC_MESSAGES/install.mo
 usr/share/locale/fa_IR/LC_MESSAGES/ipcop.mo
 usr/share/locale/fi_FI/LC_MESSAGES/install.mo
 usr/share/locale/fi_FI/LC_MESSAGES/ipcop.mo
 usr/share/locale/fr_FR/LC_MESSAGES/install.mo
 usr/share/locale/fr_FR/LC_MESSAGES/ipcop.mo
-usr/share/locale/gu_IN/LC_MESSAGES/install.mo
+#usr/share/locale/gu_IN/LC_MESSAGES/install.mo
 usr/share/locale/gu_IN/LC_MESSAGES/ipcop.mo
 usr/share/locale/hu_HU/LC_MESSAGES/install.mo
 usr/share/locale/hu_HU/LC_MESSAGES/ipcop.mo
 usr/share/locale/it_IT/LC_MESSAGES/install.mo
 usr/share/locale/it_IT/LC_MESSAGES/ipcop.mo
-usr/share/locale/ja_JP/LC_MESSAGES/install.mo
+#usr/share/locale/ja_JP/LC_MESSAGES/install.mo
 usr/share/locale/ja_JP/LC_MESSAGES/ipcop.mo
-usr/share/locale/lt_LT/LC_MESSAGES/install.mo
+#usr/share/locale/lt_LT/LC_MESSAGES/install.mo
 usr/share/locale/lt_LT/LC_MESSAGES/ipcop.mo
 usr/share/locale/nl_NL/LC_MESSAGES/install.mo
 usr/share/locale/nl_NL/LC_MESSAGES/ipcop.mo
@@ -49,25 +49,27 @@
 usr/share/locale/pt_BR/LC_MESSAGES/ipcop.mo
 usr/share/locale/pt_PT/LC_MESSAGES/install.mo
 usr/share/locale/pt_PT/LC_MESSAGES/ipcop.mo
-usr/share/locale/ro_RO/LC_MESSAGES/install.mo
+#usr/share/locale/ro_RO/LC_MESSAGES/install.mo
 usr/share/locale/ro_RO/LC_MESSAGES/ipcop.mo
-usr/share/locale/ru_RU/LC_MESSAGES/install.mo
+#usr/share/locale/ru_RU/LC_MESSAGES/install.mo
 usr/share/locale/ru_RU/LC_MESSAGES/ipcop.mo
-usr/share/locale/sk_SK/LC_MESSAGES/install.mo
+#usr/share/locale/sk_SK/LC_MESSAGES/install.mo
 usr/share/locale/sk_SK/LC_MESSAGES/ipcop.mo
-usr/share/locale/sl_SI/LC_MESSAGES/install.mo
+#usr/share/locale/sl_SI/LC_MESSAGES/install.mo
 usr/share/locale/sl_SI/LC_MESSAGES/ipcop.mo
+usr/share/locale/so_SO/LC_MESSAGES/install.mo
+usr/share/locale/so_SO/LC_MESSAGES/ipcop.mo
 usr/share/locale/sv_SE/LC_MESSAGES/install.mo
 usr/share/locale/sv_SE/LC_MESSAGES/ipcop.mo
-usr/share/locale/th_TH/LC_MESSAGES/install.mo
+#usr/share/locale/th_TH/LC_MESSAGES/install.mo
 usr/share/locale/th_TH/LC_MESSAGES/ipcop.mo
 usr/share/locale/tr_TR/LC_MESSAGES/install.mo
 usr/share/locale/tr_TR/LC_MESSAGES/ipcop.mo
-usr/share/locale/ur_PK/LC_MESSAGES/install.mo
+#usr/share/locale/ur_PK/LC_MESSAGES/install.mo
 usr/share/locale/ur_PK/LC_MESSAGES/ipcop.mo
 usr/share/locale/vi_VN/LC_MESSAGES/install.mo
 usr/share/locale/vi_VN/LC_MESSAGES/ipcop.mo
-usr/share/locale/zh_CN/LC_MESSAGES/install.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/install.mo
 usr/share/locale/zh_CN/LC_MESSAGES/ipcop.mo
-usr/share/locale/zh_TW/LC_MESSAGES/install.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/install.mo
 usr/share/locale/zh_TW/LC_MESSAGES/ipcop.mo

Modified: ipcop/trunk/lfs/initramfs
===================================================================
--- ipcop/trunk/lfs/initramfs	2008-01-19 11:39:52 UTC (rev 1013)
+++ ipcop/trunk/lfs/initramfs	2008-01-21 21:38:06 UTC (rev 1014)
@@ -168,11 +168,10 @@
         # Language info for installer
 	cp $(DIR_SRC)/langs/list				$(INITRAMFS_DIR)/usr/share/locale/list
 	
-	# Locale for installer
-	for i in $(DIR_SRC)/langs/*_* ; do \
-		mkdir -p $(INITRAMFS_DIR)/usr/share/locale/`basename $$i`/LC_MESSAGES; \
-		msgfmt $$i/install.po -o \
-			$(INITRAMFS_DIR)/usr/share/locale/`basename $$i`/LC_MESSAGES/install.mo; \
+	# Locale for installer, do not create but copy
+	for i in /usr/share/locale/*_*/LC_MESSAGES/install.mo ; do \
+		mkdir -p $(INITRAMFS_DIR)/`dirname $$i`; \
+		cp $$i $(INITRAMFS_DIR)/$$i; \
 	done
 
 	# Copy locale archive
@@ -242,6 +241,9 @@
 	# Copy the NETWORK modules
 	cp -af /lib/modules/$(KVER)/kernel/drivers/net		$(INITRAMFS_DIR)/lib/modules/$(KVER)/kernel/drivers
 							
+	# Copy some additional modules
+	cp -af /lib/modules/$(KVER)/kernel/lib 			$(INITRAMFS_DIR)/lib/modules/$(KVER)/kernel
+
 	# Make new dependencies
 	depmod -a -F /boot/System.map-$(KVER) $(KVER)
 
@@ -534,7 +536,11 @@
 	cp -a   $(INITRAMFS_DIR)/lib/modules/$(KVER)/kernel/drivers/net \
 								$(FLOPPY_ROOT_DIR)/lib/modules/$(KVER)/kernel/drivers/
 
-	# Remove some modules so we can fit everything on one floppy
+	# Copy some additional modules
+	cp -a   $(INITRAMFS_DIR)/lib/modules/$(KVER)/kernel/lib \
+								$(FLOPPY_ROOT_DIR)/lib/modules/$(KVER)/kernel
+
+        # Remove some modules so we can fit everything on one floppy
 	for directory in atl1 bonding ixgb myri10ge sk98lin tokenring usb wan wireless; do \
 		rm -fr $(FLOPPY_ROOT_DIR)/lib/modules/$(KVER)/kernel/drivers/net/$$directory; \
 	done

Modified: ipcop/trunk/lfs/ipcop-lang
===================================================================
--- ipcop/trunk/lfs/ipcop-lang	2008-01-19 11:39:52 UTC (rev 1013)
+++ ipcop/trunk/lfs/ipcop-lang	2008-01-21 21:38:06 UTC (rev 1014)
@@ -70,14 +70,19 @@
 	# done
 	chown -R root:root $(CONFIG_ROOT)/langs
 
-	# Locale (en_GB for now), also add to locale-archive
+	# Locale files for GUI
 	for i in $(DIR_SRC)/langs/*_* ; do \
 		mkdir -p /usr/share/locale/`basename $$i`/LC_MESSAGES; \
 		msgfmt $$i/ipcop.po -o /usr/share/locale/`basename $$i`/LC_MESSAGES/ipcop.mo; \
-		msgfmt $$i/install.po -o /usr/share/locale/`basename $$i`/LC_MESSAGES/install.mo; \
 		localedef -i `basename $$i` -f UTF-8 `basename $$i.utf8` --no-archive; \
 	done
 
-	# Locale files for installer are created later in initramfs
+	# Locale files for installer, only create .mo files that will be used
+	for i in `grep -v "no-installer" $(DIR_SRC)/langs/list | cut -d ':' -f 2` ; do \
+		mkdir -p /usr/share/locale/$$i/LC_MESSAGES; \
+		msgfmt $(DIR_SRC)/langs/$$i/install.po -o /usr/share/locale/$$i/LC_MESSAGES/install.mo; \
+	done
 
+        # Locale files for installer are created later in initramfs
+
 	@$(POSTBUILD)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.