diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-06 23:44:41 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-03-06 23:44:41 (GMT) |
| commit | 0f084d60beb0c7e9cec431ba45f671abbf594f3c (patch) | |
| tree | fa8ec18e7439c03f0a95d4a7b1ff78e85e516429 | |
| parent | ac867dba6905e30cc7185f8f66e959b60d8183b9 (diff) | |
| parent | 73bd601ae96da3b99fe0c12c1a78e550e81e4ed1 (diff) | |
Merge 'refs/merge-requests/3' from jerry
| -rw-r--r-- | examples/dextrose4-xo4-au.ini | 2 | ||||
| -rwxr-xr-x | examples/setAU-ARM.sh | 2 | ||||
| -rwxr-xr-x | examples/setAU.sh | 2 | ||||
| -rw-r--r-- | modules/base/kspost.10.version_number.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/dextrose4-xo4-au.ini b/examples/dextrose4-xo4-au.ini index ddf989f..a6d4e14 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 1a +customization_info=XO-system 1a-pre olpc_version_major=1 diff --git a/examples/setAU-ARM.sh b/examples/setAU-ARM.sh index 195f006..e5a75cb 100755 --- a/examples/setAU-ARM.sh +++ b/examples/setAU-ARM.sh @@ -14,7 +14,7 @@ mkdir -p $INSTALL_ROOT/home/olpc/.sugar/default/ ###### OLPC MODS ######### ## olpc-utils - ensure TZ is set for all enviroments like tty1 tty2 REVIEW -patch $INSTALL_ROOT/etc/profile.d/zzz_olpc.sh $GITDIR/olpc-utils/zzz_olpc.diff +#patch $INSTALL_ROOT/etc/profile.d/zzz_olpc.sh $GITDIR/olpc-utils/zzz_olpc.diff # custom olpc.fth to detected missing mfg-data tags # cp $GITDIR/olpc.fth $INSTALL_ROOT/boot/ diff --git a/examples/setAU.sh b/examples/setAU.sh index c924ea7..b43f83b 100755 --- a/examples/setAU.sh +++ b/examples/setAU.sh @@ -12,7 +12,7 @@ tar -jxvf $GITDIR/au.org.laptop.FirefoxEnGBActivity.tar.bz2 -C $INSTALL_ROOT/hom ###### OLPC MODS ######### ## olpc-utils - ensure TZ is set for all enviroments like tty1 tty2 REVIEW -patch $INSTALL_ROOT/etc/profile.d/zzz_olpc.sh $GITDIR/olpc-utils/zzz_olpc.diff +#patch $INSTALL_ROOT/etc/profile.d/zzz_olpc.sh $GITDIR/olpc-utils/zzz_olpc.diff # custom olpc.fth to detected missing mfg-data tags # cp $GITDIR/olpc.fth $INSTALL_ROOT/boot/ diff --git a/modules/base/kspost.10.version_number.sh b/modules/base/kspost.10.version_number.sh index 8f6b5ac..c118aa8 100644 --- a/modules/base/kspost.10.version_number.sh +++ b/modules/base/kspost.10.version_number.sh @@ -22,7 +22,7 @@ if [[ "$official" != "1" ]]; then custbstr="$custinfo" fi -buildstr="${custstr} for ${platform} (build $buildnr)" +buildstr="${custbstr} for ${platform} (build $buildnr)" cat <<EOF # needed for spin debranding |