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:06:06 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2012-08-18 08:10:49 (GMT)
commit7fb4f868a44683c61a491dff5d76308dc60fefae (patch)
tree51e2c58a144cef171eb07ba78951beaca56b8633
parent155f77ee52d87fecb28a6449394dfe71da608847 (diff)
More general package name
-rw-r--r--Makefile4
-rw-r--r--deployment.spec (renamed from sweets-deployment.spec)4
-rw-r--r--image/xo-1.5.ini2
-rw-r--r--image/xo-1.ini2
4 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fa32ae5..9421dd5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-VERSION = $(shell grep "^Version:" sweets-deployment.spec | sed 's/^Version: *//')
+VERSION = $(shell grep "^Version:" deployment.spec | sed 's/^Version: *//')
all:
dist:
- git archive --prefix=sweets-deployment-$(VERSION)/ HEAD | gzip > sweets-deployment-$(VERSION).tar.gz
+ git archive --prefix=deployment-$(VERSION)/ HEAD | gzip > deployment-$(VERSION).tar.gz
.PHONY: dist
diff --git a/sweets-deployment.spec b/deployment.spec
index 963e3f5..82c132b 100644
--- a/sweets-deployment.spec
+++ b/deployment.spec
@@ -1,4 +1,6 @@
-Name: sweets-deployment
+# If package is named differently to "deployment", it should provide
+# "deployment" name to not brake "sweets" olpc-os-builder module
+Name: deployment
Version: 0.1
Release: 1
Group: Development/System
diff --git a/image/xo-1.5.ini b/image/xo-1.5.ini
index c1e39e1..6afa72d 100644
--- a/image/xo-1.5.ini
+++ b/image/xo-1.5.ini
@@ -6,7 +6,7 @@
modules =
# Create ext4 SD card image files to flash on XO-1.5 laptops.
sd_card_image,
-# This handy module includes all needed options and modules to make
+# This handy module includes all needed options to make
# downstream distribution based on stable OLPC 11.3.1 release on XO-1.5 laptops.
# It might override other modules' default settings, so, keep it last.
# For other OLPC release modules, see sources on
diff --git a/image/xo-1.ini b/image/xo-1.ini
index 9fb66b3..b09be08 100644
--- a/image/xo-1.ini
+++ b/image/xo-1.ini
@@ -6,7 +6,7 @@
modules =
# Create .img and .crc jffs2 image files to flash on XO-1 laptops.
jffs2_image,
-# This handy module includes all needed options and modules to make
+# This handy module includes all needed options to make
# downstream distribution based on stable OLPC 11.3.1 release on XO-1 laptops.
# It might override other modules' default settings, so, keep it last.
# For other OLPC release modules, see sources on