[Libosinfo] [PATCH 35/39] data: split ubuntu into one file per install script
Daniel P. Berrange
berrange at redhat.com
Mon Sep 28 15:51:53 UTC 2015
Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
configure.ac | 1 +
data/install-scripts/Makefile.am | 3 +--
data/install-scripts/ubuntu/Makefile.am | 1 +
data/install-scripts/{ubuntu.xml => ubuntu/ubuntu-jeos.xml.in} | 2 --
4 files changed, 3 insertions(+), 4 deletions(-)
create mode 100644 data/install-scripts/ubuntu/Makefile.am
rename data/install-scripts/{ubuntu.xml => ubuntu/ubuntu-jeos.xml.in} (99%)
diff --git a/configure.ac b/configure.ac
index ebf0fd0..2f588ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,7 @@ AC_CONFIG_FILES([
data/install-scripts/debian/Makefile
data/install-scripts/fedora/Makefile
data/install-scripts/rhel/Makefile
+ data/install-scripts/ubuntu/Makefile
data/oses/Makefile
data/oses/altlinux/Makefile
data/oses/centos/Makefile
diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 1800762..8b18cd8 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -3,11 +3,10 @@ SUBDIRS = \
debian \
fedora \
rhel \
+ ubuntu \
$(NULL)
databasedir = $(pkgdatadir)/db/install-scripts/
-database_DATA = \
- ubuntu.xml \
windows-sif.xml \
windows-cmd.xml \
windows-reg.xml \
diff --git a/data/install-scripts/ubuntu/Makefile.am b/data/install-scripts/ubuntu/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/install-scripts/ubuntu/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/install-scripts/ubuntu.xml b/data/install-scripts/ubuntu/ubuntu-jeos.xml.in
similarity index 99%
rename from data/install-scripts/ubuntu.xml
rename to data/install-scripts/ubuntu/ubuntu-jeos.xml.in
index 86987b8..3c4868d 100644
--- a/data/install-scripts/ubuntu.xml
+++ b/data/install-scripts/ubuntu/ubuntu-jeos.xml.in
@@ -1,5 +1,4 @@
<libosinfo version="0.0.1">
- <!-- JEOS PROFILE -->
<install-script id='http://ubuntu.com/scripts/ubuntu/jeos'>
<profile>jeos</profile>
<expected-filename>preseed.cfg</expected-filename>
@@ -154,5 +153,4 @@ ubiquity ubiquity/success_command string sed -i 's/eject -p -m.*/& [ "$promp
</xsl:stylesheet>
</template>
</install-script>
-
</libosinfo>
--
2.4.3
More information about the Libosinfo
mailing list