Added missing files from dx3 for basic build

4 files changed, 63 insertions, 36 deletions

diff --git a/examples/dextrose4-xo1.5-au.ini b/examples/dextrose4-xo1.5-au.ini
index 3b8bddd..6eadbd4 100644
--- a/examples/dextrose4-xo1.5-au.ini
+++ b/examples/dextrose4-xo1.5-au.ini
@@ -5,10 +5,10 @@ target_platform=XO-1.5
 lang=en_AU,en_GB,en_US,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN,de,hy,mi_NZ
 customization_info=One Education OS 1.5
 
-olpc_version_major=4
-olpc_version_minor=0
+olpc_version_major=1
+olpc_version_minor=5
 olpc_version_release=0
-customization_tag=DX
+customization_tag=OE
 
 ; 401DX1.zd means: Dextrose 4.0 compilation 1 for XO 1.5, broken into
 ; Version major number
@@ -22,7 +22,7 @@ timezone=Australia/Darwin
 versioned_fs=1
 prepopulate_run=1
 python_optimize=2
-
+make_tree_tarball=0
 
 [xo1_5]
 
@@ -32,12 +32,13 @@ compress_disk_image=1
 make_zd=1
 
 [repos]
-fedora=fedora,fedora-updates,fedora-updates-testing
-olpc_publicrpms_1=1,f18
-olpc_publicrpms_2=1,f18-xo1.5
-add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+olpc_frozen_1=0,koji.dist-f18-i686-13.1.0
+olpc_frozen_2=0,koji.dist-f18-i686-updates-13.1.0
+olpc_frozen_3=1,local.13.1.0
+olpc_frozen_4=1,local.13.1.0-xo1.5
+add_excludes_to=koji.dist-f18-i686-13.1.0,koji.dist-f18-i686-updates-13.1.0
 custom_repo_1=1,dextrose,http://build.activitycentral.com/devel-rpms
-custom_repo_2=2,dextrose-au,http://build.activitycentral.com/repositories/OEOS15devel/
+custom_repo_2=1,dextrose-au,http://build.activitycentral.com/repositories/OEOS15devel/
 
 
 [yumcfg]
@@ -103,7 +104,8 @@ protected_activities=
 	vu.lux.olpc.Speak
 
 [sugar_activity_group]
-url=http://wiki.laptop.org/go/Activities/OLPCAU/i386/11.3.1
+;url=http://wiki.laptop.org/go/Activities/OLPCAU/i386/11.3.1
+url=http://wiki.laptop.org/go/Activities/DX/4
 activity_group_systemwide=0
 
 [sugar_activities_extra]
diff --git a/examples/setAU.sh b/examples/setAU.sh
index b1c8e85..354289c 100755
--- a/examples/setAU.sh
+++ b/examples/setAU.sh
@@ -1,14 +1,16 @@
 #!/bin/bash
 
-GITDIR=/opt/git/xo-au/olpc-os-builder
-echo "a investigar!"
-echo "el valor de la variable gitdir debe estar en /tmp/gitdir antes de salir de bash"
-bash 
-GITDIR=`cat /tmp/gitdir`
+GITDIR=$PWD
 NEWLANG="en_AU.UTF-8"
+
+# add mi_lang_pack_v2 support
+cp $GITDIR/mi_lang_pack_v2.sh $INSTALL_ROOT/root
+chroot $INSTALL_ROOT sh /root/mi_lang_pack_v2.sh
+rm $INSTALL_ROOT/root/mi_lang_pack_v2.sh
+
 ###### SUGAR MODS ####### 
 mkdir -p $INSTALL_ROOT/home/olpc/.sugar/default/
-tar -jxvf $GITDIR/au.org.laptop.FirefoxEnGBActivity.tar.bz2 -C $INSTALL_ROOT/home/olpc/.sugar/default/
+#tar -jxvf $GITDIR/au.org.laptop.FirefoxEnGBActivity.tar.bz2 -C $INSTALL_ROOT/home/olpc/.sugar/default/
 
 ###### OLPC MODS #########
 # patch olpc-configure to not play with ~/.18n or the below SET  
@@ -26,14 +28,34 @@ patch $INSTALL_ROOT/etc/profile.d/zzz_olpc.sh $GITDIR/olpc-utils/zzz_olpc.diff
 patch $INSTALL_ROOT/etc/rc.d/init.d/halt $GITDIR/haltF14.diff
 
 # custom olpc.fth to detected missing mfg-data tags
-cp $GITDIR/olpc.fth $INSTALL_ROOT/boot/
+#cp $GITDIR/olpc.fth $INSTALL_ROOT/boot/
 
 # custom halt file
 cp $GITDIR/sub-files/halt $INSTALL_ROOT/etc/rc.d/init.d/
 
 # add DejaVuOlpc-Regular.ttf to image
 mkdir $INSTALL_ROOT/usr/share/fonts/abc123-Regular
-cp $GITDIR/sub-files/abc123-Regular.ttf $INSTALL_ROOT/usr/share/fonts/abc123-Regular/
+cp $GITDIR/sub-files/abc123-Regular.ttf $INSTALL_ROOT/usr/share/fonts/abc123/
+cat << EOF > $INSTALL_ROOT/etc/fonts/conf.d/52-abc123.conf
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!-- Generic name assignment -->
+  <alias>
+    <family>abc123</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+  <!-- Generic name aliasing -->
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>abc123</family>
+    </prefer>
+  </alias>
+</fontconfig>
+EOF
 
 ###### SET  ######
 cat << EOF >> $INSTALL_ROOT/etc/sysconfig/i18n
@@ -50,12 +72,12 @@ EOF
 ###### OLPCAU MODS ######
 
 # hack around nodocs for cups
-sed -i -e "s/%_excludedocs 1/#%_excludedocs 1/" $INSTALL_ROOT/etc/rpm/macros.imgcreate
-rpm -ivh --force --root=$INSTALL_ROOT $GITDIR/build/cache/imgcreate/*f14*/packages/cups*
-sed -i -e "s/#%_excludedocs 1/%_excludedocs 1/" $INSTALL_ROOT/etc/rpm/macros.imgcreate
+#sed -i -e "s/%_excludedocs 1/#%_excludedocs 1/" $INSTALL_ROOT/etc/rpm/macros.imgcreate
+#rpm -ivh --force --root=$INSTALL_ROOT $GITDIR/build/cache/imgcreate/*f14*/packages/cups*
+#sed -i -e "s/#%_excludedocs 1/%_excludedocs 1/" $INSTALL_ROOT/etc/rpm/macros.imgcreate
 
 ### patch FF not to load update screen
-patch $INSTALL_ROOT/usr/lib/firefox-3.6/defaults/preferences/firefox-branding.js $GITDIR/brandingF14.diff
+#patch $INSTALL_ROOT/usr/lib/firefox-3.6/defaults/preferences/firefox-branding.js $GITDIR/brandingF14.diff
 
 ### patch in adobe and school font copyrite info
 patch $INSTALL_ROOT/usr/share/sugar/extensions/cpsection/aboutcomputer/view.py $GITDIR/copyrightF14dex.diff
diff --git a/modules/custom_scripts/kspost.76.custom_scripts.inc b/modules/custom_scripts/kspost.76.custom_scripts.inc
index 8ef5892..9f38c12 100644
--- a/modules/custom_scripts/kspost.76.custom_scripts.inc
+++ b/modules/custom_scripts/kspost.76.custom_scripts.inc
@@ -2,7 +2,8 @@
 mkdir /home/olpc/log
 
 # add mi_lang_pack_v2 support
-/build_shared/mi_lang_pack_v2.sh
+#sh /root/mi_lang_pack_v2.sh
+#rm /root/mi_lang_pack_v2.sh
 
 # add usb_wwlan sd to new inhibit class - modules
 touch /etc/powerd/flags/modules-inhibits
@@ -455,7 +456,7 @@ chown olpc:olpc /home/olpc/.config/autostart/gpk-update-icon.desktop
 # works for firefox, won't start unless cfg file is present  
 # confirm browse/sugar works when using all.js
 # Browse ignores what is in xulrunner but intl.accept_languages is ok
-cat << EOF > /usr/lib/firefox-3.6/defaults/preferences/loadcustom.js
+cat << EOF #> /usr/lib/firefox-3.6/defaults/preferences/loadcustom.js
 // use a cfg file 
 pref("general.config.obscure_value", 0);
 pref("general.config.filename", "olpc.cfg");
@@ -573,19 +574,21 @@ pref("print.tmp.printerfeatures.PostScript/default.supports_spoolercommand_chang
 
 EOF
 
-ln -sf /home/olpc/.config/olpc.cfg /usr/lib/firefox-3.6/olpc.cfg
+#ln -sf /home/olpc/.config/olpc.cfg /usr/lib/firefox-3.6/olpc.cfg
 
 # use sugar homepage for firefox button
-echo "file:///home/olpc/.library_pages/index.html" > /usr/lib/firefox-3.6/browserconfig.properties
+#echo "file:///home/olpc/.library_pages/index.html" > /usr/lib/firefox-3.6/browserconfig.properties
 
 # chown the directories added in post-custom-75 setAU.sh step
-chown -R olpc:olpc /home/olpc/.config
-chown -R olpc:olpc /home/olpc/.gimp-2.6
-chown -R olpc:olpc /home/olpc/.AbiSuite
-chown -R olpc:olpc /home/olpc/.gtk-recordmydesktop
-chown -R olpc:olpc /home/olpc/.gconf
-chown -R olpc:olpc /home/olpc/.sugar/
-chmod 766 /home/olpc/.sugar/default/au.org.laptop.FirefoxEnGBActivity/
+#chown -R olpc:olpc /home/olpc/.config
+#chown -R olpc:olpc /home/olpc/.gimp-2.6
+#chown -R olpc:olpc /home/olpc/.AbiSuite
+#chown -R olpc:olpc /home/olpc/.gtk-recordmydesktop
+#chown -R olpc:olpc /home/olpc/.gconf
+#chown -R olpc:olpc /home/olpc/.sugar/
+#chmod 766 /home/olpc/.sugar/default/au.org.laptop.FirefoxEnGBActivity/
+
+chown -R olpc:olpc /home/olpc/
 
 ###############################
 ##### Site Specific Below ##### 
@@ -596,7 +599,7 @@ echo "" > /home/olpc/Activities/Browse.activity/data/homepage.conf
 echo "file:///home/olpc/.library_pages/index.html" > /home/olpc/Activities/Browse.activity/data/homepage.conf
 
 sed -i -e "s/'Monospace'/'Monospace 8'/" /home/olpc/Activities/Terminal.activity/terminal.py
-sed -i -e "#file:///home/olpc/Library/wdl/index.en.html#file:///home/olpc/Library/WorldDigitalLibrary/index.en.html#" /home/olpc/Library/WorldDigitalLibrary/index.html
+[ -f /home/olpc/Library/WorldDigitalLibrary/index.html ] && sed -i -e "#file:///home/olpc/Library/wdl/index.en.html#file:///home/olpc/Library/WorldDigitalLibrary/index.en.html#" /home/olpc/Library/WorldDigitalLibrary/index.html
 
 # enable dhcp option 119 by default
 cat << EOF > /etc/dhclient-eth0.conf
diff --git a/modules/x11/kspost.90.tweaks.inc b/modules/x11/kspost.90.tweaks.inc
index efa2cec..7e74daf 100644
--- a/modules/x11/kspost.90.tweaks.inc
+++ b/modules/x11/kspost.90.tweaks.inc
@@ -184,8 +184,8 @@ fi
 
 
 # au#1588: Need to make soft-links, to join library-versions.
-ln -s /usr/lib/libssl.so.10    /usr/lib/libssl.so.8
-ln -s /usr/lib/libcrypto.so    /usr/lib/libcrypto.so.8
+#ln -s /usr/lib/libssl.so.10    /usr/lib/libssl.so.8
+#ln -s /usr/lib/libcrypto.so    /usr/lib/libcrypto.so.8
 
 
 # disable login sound