Merge branch 'jvonau-au-oob' into dextrose4-au

6 files changed, 10 insertions, 9 deletions

diff --git a/examples/dextrose4-xo1.5-au.ini b/examples/dextrose4-xo1.5-au.ini
index e87a72d..1c7de8f 100644
--- a/examples/dextrose4-xo1.5-au.ini
+++ b/examples/dextrose4-xo1.5-au.ini
@@ -3,7 +3,7 @@ fedora_release=18
 fedora_arch=i386
 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=XO-system 1.0
+customization_info=XO-system 1a
 
 olpc_version_major=1
 olpc_version_minor=5
diff --git a/examples/dextrose4-xo1.75-au.ini b/examples/dextrose4-xo1.75-au.ini
index 444b723..08a39a6 100644
--- a/examples/dextrose4-xo1.75-au.ini
+++ b/examples/dextrose4-xo1.75-au.ini
@@ -3,7 +3,7 @@ fedora_release=18
 fedora_arch=armhfp
 target_platform=XO-1.75
 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=XO-system 1.0
+customization_info=XO-system 1a
 
 
 olpc_version_major=1
diff --git a/examples/dextrose4-xo4-au.ini b/examples/dextrose4-xo4-au.ini
index 5ad5727..ddf989f 100644
--- a/examples/dextrose4-xo4-au.ini
+++ b/examples/dextrose4-xo4-au.ini
@@ -3,7 +3,7 @@ fedora_release=18
 fedora_arch=armhfp
 target_platform=XO-4
 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=XO-system 1.0
+customization_info=XO-system 1a
 
 
 olpc_version_major=1
diff --git a/examples/setAU-ARM.sh b/examples/setAU-ARM.sh
index 95b9e2b..195f006 100755
--- a/examples/setAU-ARM.sh
+++ b/examples/setAU-ARM.sh
@@ -57,7 +57,7 @@ EOF
 
 ###### OLPCAU MODS ######
 ### patch in adobe and school font copyrite info
-patch $INSTALL_ROOT/usr/share/sugar/extensions/cpsection/aboutcomputer/view.py $GITDIR/copyrightF14dex.diff
+# patch $INSTALL_ROOT/usr/share/sugar/extensions/cpsection/aboutcomputer/view.py $GITDIR/copyrightF14dex.diff
 
 ### move to rpms ###
 # sets inkscape
diff --git a/examples/setAU.sh b/examples/setAU.sh
index 6733db2..c924ea7 100755
--- a/examples/setAU.sh
+++ b/examples/setAU.sh
@@ -55,7 +55,7 @@ EOF
 
 ###### OLPCAU MODS ######
 ### patch in adobe and school font copyrite info
-patch $INSTALL_ROOT/usr/share/sugar/extensions/cpsection/aboutcomputer/view.py $GITDIR/copyrightF14dex.diff
+# patch $INSTALL_ROOT/usr/share/sugar/extensions/cpsection/aboutcomputer/view.py $GITDIR/copyrightF14dex.diff
 
 ### move to rpms ###
 # sets inkscape
diff --git a/modules/base/kspost.10.version_number.sh b/modules/base/kspost.10.version_number.sh
index c3a37d9..8f6b5ac 100644
--- a/modules/base/kspost.10.version_number.sh
+++ b/modules/base/kspost.10.version_number.sh
@@ -10,10 +10,11 @@ platform=$(read_config global target_platform)
 official=$(read_config global official)
 custinfo=$(read_config global customization_info)
 buildnr=$(read_buildnr)
+image_name=$(read_config global image_name)
 
 [ -z "$custinfo" ] && custinfo="customized"
 #add leading space
-custinfo=" $custinfo"
+#custinfo=" $custinfo"
 
 custstr=
 if [[ "$official" != "1" ]]; then
@@ -21,16 +22,16 @@ if [[ "$official" != "1" ]]; then
 	custbstr="$custinfo"
 fi
 
-buildstr="$majver.$minver.$relver for ${platform}${custstr} (build $buildnr)"
+buildstr="${custstr} for ${platform} (build $buildnr)"
 
 cat <<EOF
 # needed for spin debranding
-echo "OLPC release $majver (based on Fedora $fver)" > /etc/fedora-release
+echo "${buildstr} (based on Fedora $fver)" > /etc/fedora-release
 
 # this is used by the activity updater
 echo "$majver.$minver.$relver" > /etc/olpc-release
 
-sed -i -e "1s/.*/OLPC OS $buildstr/" /etc/issue
+sed -i -e "1s/.*/$buildstr/" /etc/issue
 cp /etc/issue /etc/issue.net
 
 echo "${buildstr}" > /boot/olpc_build