From 5677dcad6e9085517e2828c87efea30b543b3b92 Mon Sep 17 00:00:00 2001 From: Sebastian Silva Date: Sun, 10 Nov 2013 10:05:43 +0000 Subject: Production as of Beta4. Corresponds to hxp126-129. --- diff --git a/Makefile b/Makefile index aa8cb8f..9421dd5 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ -VERSION = $(shell grep "^Version:" deployment-testing.spec | sed 's/^Version: *//') +VERSION = $(shell grep "^Version:" deployment.spec | sed 's/^Version: *//') all: dist: - git archive --prefix=deployment-testing-$(VERSION)/ HEAD | gzip > deployment-testing-$(VERSION).tar.gz + git archive --prefix=deployment-$(VERSION)/ HEAD | gzip > deployment-$(VERSION).tar.gz .PHONY: dist diff --git a/deployment-testing.spec b/deployment-testing.spec index de6b209..17ec0a7 100644 --- a/deployment-testing.spec +++ b/deployment-testing.spec @@ -41,6 +41,7 @@ cp %{_sysconfdir}/PackageKit/PackageKit.conf{.sweets,} %{_sysconfdir}/modprobe.d/libertas.conf %{_sysconfdir}/polkit-1/localauthority/50-local.d/deployment.pkla %{_sysconfdir}/PackageKit/PackageKit.conf.sweets +%{_sysconfdir}/sweets.d/etc/PackageKit/PackageKit.conf %{_sysconfdir}/X11/xorg.conf.d/zapnot.conf %{_sysconfdir}/yum.repos.d/Hexoquinasa:1.repo %{_sysconfdir}/yum.repos.d/SweetsDistribution.repo diff --git a/deployment.spec b/deployment.spec index 9d70439..ade45d5 100644 --- a/deployment.spec +++ b/deployment.spec @@ -41,6 +41,7 @@ cp AUTHORS COPYING README %{buildroot}/%{_datadir}/doc/%{name}/ %{_sysconfdir}/sugar/blacklist/deployment %{_sysconfdir}/sweets.d/etc/PackageKit/PackageKit.conf %{_sysconfdir}/sweets.conf +%{_sysconfdir}/locale.gen %{_sysconfdir}/yum.repos.d/Hexoquinasa:1.repo %{_datadir}/%{name} %{_datadir}/doc/%{name} diff --git a/etc/polkit-1/localauthority/50-local.d/deployment.pkla b/etc/polkit-1/localauthority/50-local.d/deployment.pkla index 94c329b..283e1be 100644 --- a/etc/polkit-1/localauthority/50-local.d/deployment.pkla +++ b/etc/polkit-1/localauthority/50-local.d/deployment.pkla @@ -1,20 +1,13 @@ [AllowSignedUpdates] Identity=* Action=org.freedesktop.packagekit.package-install -ResultAny=yes -ResultInactive=yes +ResultAny=no +ResultInactive=no ResultActive=yes [AllowNotSignedUpdates] Identity=* Action=org.freedesktop.packagekit.package-install-untrusted -ResultAny=yes -ResultInactive=yes -ResultActive=yes - -[AllowSystemUpdate] -Identity=* -Action=org.freedesktop.packagekit.system-update -ResultAny=yes -ResultInactive=yes +ResultAny=no +ResultInactive=no ResultActive=yes diff --git a/etc/sweets.conf b/etc/sweets.conf index 3067be7..a227c6c 100644 --- a/etc/sweets.conf +++ b/etc/sweets.conf @@ -23,7 +23,7 @@ cpsection = # http://wiki.sugarlabs.org/go/Platform_Team/Sugar_Network/Implementation#sugar-network-client [client] # url to connect to Sugar Network server API -#api-url = http://node.sugarlabs.org +api-url = http://node.sugarlabs.org # space separated list of layers to restrict Sugar Network content by # for now, "pilot" layer is being used to QA most useful/stable activities layers = pilot diff --git a/image/common.ini b/image/common.ini index 90ff389..bcd24ca 100644 --- a/image/common.ini +++ b/image/common.ini @@ -5,7 +5,7 @@ [global] # Image title. # Put your title here. -customization_info = Hexoquinasa v1.0 BETA3 +customization_info = Hexoquinasa v1.3 BETA4 # Languages to include #langs=es,en_US,pt,pt_BR,fr,de,qu,ayc,quz @@ -47,18 +47,28 @@ modules_extra = path = latestbuild [sweets] +# Name of Sweets Distribution repository current one is based on. +# http://wiki.sugarlabs.org/go/Template:Sweets_Distribution_Linkbar +sweets_repository = 0.94:SugarNetwork + +# Url to downstream repository which should contain (or provide) +# "deployment" package. Put your url here. +deployment_repository_url = http://download.sugarlabs.org/packages/Hexoquinasa:/1/Fedora-14/ + # Set particular image locales; if omitted, the full list will be generated -locales = es_PE,ayc_PE,en_US,de_DE,fr_FR,pt_BR +locales = ayc_PE,es_PE,es_ES,es_MX,en_US,de_DE,fr_FR,pt_BR,quz_PE # OBS repositories from packages.sugarlabs.org to install packages # during image building phase and for post-image system upgrades. # Each item should be in form of / repositories = # Sugar Network is being packaged in one of SweetsDistribution:* projects - SweetsDistribution:Factory/Fedora-14, + SweetsDistribution:0.94:SugarNetwork/Fedora-14, # It is a good practice to have a deployment.rpm, see [custom_packages] below Hexoquinasa:1/Fedora-14 +deployment_repository = Hexoquinasa:/1/Fedora-14 + # List of bundle_ids (or Context GUIDs in Sugar Network terms) of activities # to prefetch to the final image to make them accessible in offline right after # flasing. These activities should exist in the Sugar Network. If activities @@ -67,7 +77,7 @@ offline_activities = org.laptop.WebActivity, org.laptop.Calculate, org.laptop.Chat, -# org.vpri.EtoysActivity, + org.vpri.EtoysActivity, org.laptop.ImageViewerActivity, org.laptop.sugar.Jukebox, org.laptop.sugar.ReadActivity, @@ -91,7 +101,7 @@ offline_activities = org.sugarlabs.SimpleGraph, org.laptop.TurtleArtButia, vu.lux.olpc.Speak, -# org.laptop.WikipediaActivity, + org.laptop.WikipediaActivity, #org.laptop.WikipediaActivityQU, mulawa.Sudoku @@ -117,10 +127,10 @@ add_packages = # Deployment package which fetches all required dependencies and contains # proper configuration. Post-image support will happen by updating # `deployment.rpm` and spreading it via Sugar Network nodes. - deployment-testing, - sugar-plugin-stats, - sugar-plugin-upgrade, - sugar-stats, + deployment, +# sugar-plugin-stats, +# sugar-plugin-upgrade, +# sugar-stats, # Useful packages from rpmfusion repository. gstreamer-plugins-ugly, gstreamer-ffmpeg, diff --git a/image/post.sh b/image/post.sh index 3c4f687..3c41d81 100755 --- a/image/post.sh +++ b/image/post.sh @@ -12,7 +12,19 @@ echo Installing boot-anim mkdir -p usr/share/boot-anim cp $src_root/../boot_logo/frame00.565 usr/share/boot-anim/ -mkdir -p home/olpc/Activities -unzip -d home/olpc/Activities $src_root/../activities/Physics-11.7.xo -#unzip -d home/olpc/Activities $src_root/../activities/Speak-47.1.xo -chmod 777 home/olpc/* -R +#mkdir -p home/olpc/Activities +for i in $(ls $src_root/../activities/*.xo) +do + HOME=home/olpc usr/bin/sugar-install-bundle $i + #unzip -d home/olpc/Activities $i + echo Installing custom $i +done + +# THIS GETS OVERWRITTEN ON FIRST BOOT :-( +#cat > home/olpc/.i18n << EOF +#LANG="ayc_PE.utf8" +#LANGUAGE="ayc_PE.utf8" +#EOF + +creds=$(ls -aldn home/olpc | awk '{print $3 ":" $4}') +chown ${creds} -R home/olpc diff --git a/image/xo-1.5.ini b/image/xo-1.5.ini index b5c286f..44ecaa6 100644 --- a/image/xo-1.5.ini +++ b/image/xo-1.5.ini @@ -15,9 +15,11 @@ modules = [sd_card_image] # 2GB image -size_1 = 1932735283,zd +#size_1 = 1932735283,zd # 4GB image -#size_1 = 3865470566,zd +size_1 = 3865470566,zd +# 8GB image +#size_1 = 7730941132,zd keep_disk_image = 0 compress_disk_image = 0 make_zd = 1 -- cgit v0.9.1