Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2012-08-18 08:55:45 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2012-08-18 08:55:45 (GMT)
commit8f5152fbb06c377192c8397901e22749262d0def (patch)
tree5ae98c330e0e960079093cff3ceb2e9945a0f968
parent7fb4f868a44683c61a491dff5d76308dc60fefae (diff)
Add rpmfusion packages
-rw-r--r--deployment.spec2
-rw-r--r--image/common.ini20
2 files changed, 18 insertions, 4 deletions
diff --git a/deployment.spec b/deployment.spec
index 82c132b..3d2e8fa 100644
--- a/deployment.spec
+++ b/deployment.spec
@@ -31,7 +31,7 @@ install -m 0755 -d %{buildroot}/%{_datadir}/doc/%{name}
cp AUTHORS COPYING README %{buildroot}/%{_datadir}/doc/%{name}/
%post
-%{_datadir}/sweets-deployment/post.sh
+%{_datadir}/%{name}/post.sh
%files
%defattr(-,root,root,-)
diff --git a/image/common.ini b/image/common.ini
index 4a77bab..52d7648 100644
--- a/image/common.ini
+++ b/image/common.ini
@@ -17,17 +17,24 @@ image_name = xo%%d
# All of the following modules need to be added to keep final image consistent.
# `*sugar*` modules are not included on purpose, Sugar related configuration
# will happen in `sweets-deployment` package added by `sweets` module.
-modules_common =
+modules_required =
base,
repos,
yumcfg,
powerd,
x11,
-# Keep current build number in path set by [buildnr_from_file].
- buildnr_from_file,
# Include Sweets Distribution specific settings.
sweets
+# Useful extra modules.
+modules_extra =
+# Keep current build number in path set by [buildnr_from_file].
+ buildnr_from_file,
+# Add rpmfusion repositories to image build time and image itself.
+ rpmfusion,
+# To add extra packages from [custom_packages] section.
+ custom_packages
+
[buildnr_from_file]
# Path to file to keep current image release number.
# If you change this file manually, make sure that file content doesn't end
@@ -74,3 +81,10 @@ favorite_activities =
org.vpri.EtoysActivity,
org.laptop.TurtleArtActivity,
org.laptop.AbiWordActivity,
+
+[custom_packages]
+add_packages =
+# Useful packages from rpmfusion repository.
+ gstreamer-plugins-ugly,
+ gstreamer-ffmpeg,
+ mplayer