diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | deployment-testing.spec | 8 | ||||
| -rw-r--r-- | deployment.spec | 8 | ||||
| -rw-r--r-- | etc/polkit-1/localauthority/50-local.d/deployment.pkla | 15 | ||||
| -rw-r--r-- | etc/sweets.conf | 11 | ||||
| -rw-r--r-- | image/common.ini | 43 | ||||
| -rw-r--r-- | image/xo-1.5.ini | 4 |
7 files changed, 43 insertions, 50 deletions
@@ -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 42d01e2..17ec0a7 100644 --- a/deployment-testing.spec +++ b/deployment-testing.spec @@ -1,7 +1,7 @@ # If package is named differently to "deployment", it should provide # "deployment" name to not brake "sweets" olpc-os-builder module Name: deployment-testing -Version: 0.4 +Version: 0.3 Release: 1 Group: Development/System Summary: Meta package for Hexoquinasa XO deployment distribution @@ -40,10 +40,12 @@ cp %{_sysconfdir}/PackageKit/PackageKit.conf{.sweets,} %defattr(-,root,root,-) %{_sysconfdir}/modprobe.d/libertas.conf %{_sysconfdir}/polkit-1/localauthority/50-local.d/deployment.pkla -%{_sysconfdir}/X11/xorg.conf.d/zapnot.conf %{_sysconfdir}/PackageKit/PackageKit.conf.sweets -%{_sysconfdir}/sweets.conf +%{_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 +%{_sysconfdir}/sweets.conf %{_datadir}/%{name} %{_datadir}/doc/%{name} diff --git a/deployment.spec b/deployment.spec index bdc934e..ade45d5 100644 --- a/deployment.spec +++ b/deployment.spec @@ -1,7 +1,7 @@ # If package is named differently to "deployment", it should provide # "deployment" name to not brake "sweets" olpc-os-builder module Name: deployment -Version: 0.4 +Version: 0.3 Release: 1 Group: Development/System Summary: Meta package for Hexoquinasa XO deployment distribution @@ -24,7 +24,6 @@ Meta package for Hexoquinasa XO deployment distribution. %install install -m 0755 -d %{buildroot}/%{_sysconfdir} cp -r etc/* %{buildroot}/%{_sysconfdir}/ -mv %{buildroot}/%{_sysconfdir}/PackageKit/PackageKit.conf{,.sweets} install -m 0755 -d %{buildroot}/%{_datadir}/%{name} cat post.d/*sh > %{buildroot}/%{_datadir}/%{name}/post.sh chmod a+rx %{buildroot}/%{_datadir}/%{name}/post.sh @@ -33,15 +32,16 @@ cp AUTHORS COPYING README %{buildroot}/%{_datadir}/doc/%{name}/ %post %{_datadir}/%{name}/post.sh -cp %{_sysconfdir}/PackageKit/PackageKit.conf{.sweets,} %files %defattr(-,root,root,-) %{_sysconfdir}/modprobe.d/libertas.conf %{_sysconfdir}/polkit-1/localauthority/50-local.d/deployment.pkla %{_sysconfdir}/X11/xorg.conf.d/zapnot.conf -%{_sysconfdir}/PackageKit/PackageKit.conf.sweets +%{_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 b7d46dd..a227c6c 100644 --- a/etc/sweets.conf +++ b/etc/sweets.conf @@ -1,4 +1,4 @@ -[main] +#[main] # Helps while debugging #debug = 3 @@ -19,6 +19,15 @@ cpsection = # hanlde plugins configuration only via configuration files plugins +# Sugar Network client configuration +# 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 +# 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 + # By default, only stable Sugar Activity implementation will be fetched # from the Sugar Network. To stability selection customizable, add exceptions # to the following section. Each option shold conform the format: diff --git a/image/common.ini b/image/common.ini index 167a3c8..bcd24ca 100644 --- a/image/common.ini +++ b/image/common.ini @@ -3,15 +3,12 @@ # [global] -# Supported locales in a comma separated list. -# The format of items should be in format of `LANG[_COUNTRY[.CHARSET]]`. -# If only LANG is set, all supported variations of LANG-COUNTRY will be added. -# Default CHARSET is UTF8. -langs=es,es_MX,es_PE,en_US,pt,pt_BR,fr,de,qu,ayc,quz - # Image title. # Put your title here. -customization_info = Hexoquinasa v1.3 BETA5 +customization_info = Hexoquinasa v1.3 BETA4 + +# Languages to include +#langs=es,en_US,pt,pt_BR,fr,de,qu,ayc,quz # Image filename. # String should contain one formatting argument to make Python expression, @@ -21,9 +18,8 @@ image_name = hxp%%d # Minimal list of required modules. # All of the following modules need to be added to keep final image consistent. -# The `*sugar*` modules are not included on purpose, Sugar related configuration -# will happen in either in `sweets` section or in `deployment.rpm` package -# added from the [custom_packages] section. +# `*sugar*` modules are not included on purpose, Sugar related configuration +# will happen in `deployment.rpm` added from [custom_packages] section. modules_required = base, repos, @@ -51,30 +47,23 @@ modules_extra = path = latestbuild [sweets] -# Set current locale. If the option contains more than one value, the first -# locale will be primary and the rest will be treated as secondary locales. -# The format of items should be in format of `LANG_COUNTRY.CHARSET`. -locale = en_US.UTF8 # Name of Sweets Distribution repository current one is based on. # http://wiki.sugarlabs.org/go/Template:Sweets_Distribution_Linkbar -sweets_repository = Factory +sweets_repository = 0.94:SugarNetwork -# Url to connect to Sugar Network API server. -# There are several public nodes: -# - http://node.sugarlabs.org -# - http://node-testing.sugarlabs.org -# - http://node-devel.sugarlabs.org -api_url = http://node-testing.sugarlabs.org +# 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/ -# Comma separated list of layers to restrict Sugar Network content by -layers = pilot +# Set particular image locales; if omitted, the full list will be generated +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 <OBS_PROJECT>/<OBS_REPOSITORY> 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 @@ -88,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, @@ -112,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 @@ -138,7 +127,7 @@ 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, + deployment, # sugar-plugin-stats, # sugar-plugin-upgrade, # sugar-stats, diff --git a/image/xo-1.5.ini b/image/xo-1.5.ini index 89723b4..44ecaa6 100644 --- a/image/xo-1.5.ini +++ b/image/xo-1.5.ini @@ -15,9 +15,9 @@ 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 |