Browse code

Add libglnx source for rpm-ostre so that libglnx is not get pulled at build time from git. Minor cosmatic fixes. Removed tdnf from ostree-base repo.

Touseef Liaqat authored on 2015/08/26 18:40:15
Showing 4 changed files
... ...
@@ -4,6 +4,8 @@ Version:        2015.7
4 4
 Release:        1%{?dist}
5 5
 Source0:        rpm-ostree-%{version}.tar.gz
6 6
 %define sha1 rpm-ostree=9a0fa260d8671d9998b5f5509de1bbadd42f7127
7
+Source1:        libglnx-58a9a5c.tar.gz
8
+%define sha1 libglnx=ba892544e28201508450dd123a4ebd4dfe6d5ea7
7 9
 License:        LGPLv2+
8 10
 URL:            https://github.com/cgwalters/rpm-ostree
9 11
 Vendor:		VMware, Inc.
... ...
@@ -55,8 +57,8 @@ Requires: %{name} = %{version}-%{release}
55 55
 Includes the header files for the rpm-ostree library.
56 56
 
57 57
 %prep
58
-%autosetup -Sgit -n %{name}-%{version}
59
-git clone git://git.gnome.org/libglnx libglnx
58
+%setup -q
59
+cat /usr/src/photon/SOURCES/libglnx-58a9a5c.tar.gz | tar -xvvzf -
60 60
 
61 61
 %build
62 62
 env NOCONFIGURE=1 ./autogen.sh
... ...
@@ -1,4 +1,4 @@
1
-Welcome to PhotonOS (TP2) RPM-OSTree Server
1
+Welcome to Photon (TP2) RPM-OSTree Server
2 2
 
3 3
 \r \s \v
4 4
 
... ...
@@ -32,7 +32,7 @@ class OstreeInstaller(Installer):
32 32
     def pull_repo(self, repo_url, repo_ref):
33 33
         if self.default_repo:
34 34
             self.run("ostree remote add --repo={}/ostree/repo --set=gpg-verify=false photon {}".format(self.photon_root, repo_url), "Adding OSTree remote")
35
-            self.run("ostree pull-local --repo={}/ostree/repo {}".format(self.photon_root, self.local_repo_path), "Pulling OSTree remote repo")
35
+            self.run("ostree pull-local --repo={}/ostree/repo {}".format(self.photon_root, self.local_repo_path), "Pulling OSTree repo")
36 36
             self.run("mv {}/ostree/repo/refs/heads {}/ostree/repo/refs/remotes/photon".format(self.photon_root, self.photon_root))
37 37
             self.run("mkdir -p {}/ostree/repo/refs/heads".format(self.photon_root, self.photon_root))
38 38
         else:
... ...
@@ -152,7 +152,7 @@ class OstreeInstaller(Installer):
152 152
         self.run("{} {} {}".format(self.unmount_disk_command, '-w', self.photon_root))
153 153
         self.progress_bar.update_loading_message("Ready to restart")
154 154
         self.progress_bar.hide()
155
-        self.window.addstr(0, 0, 'Congratulations, Photon has been installed in {0} secs.\n\nPress any key to continue to boot...'.format(self.progress_bar.time_elapsed))
155
+        self.window.addstr(0, 0, 'Congratulations, Photon RPM-OSTree Host has been installed in {0} secs.\n\nPress any key to continue to boot...'.format(self.progress_bar.time_elapsed))
156 156
         if self.ks_config == None:
157 157
             self.window.content_window().getch()
158 158
         return ActionResult(True, None)
... ...
@@ -25,7 +25,7 @@
25 25
                 "systemd",
26 26
                 "openssh", "iptables",
27 27
                 "photon-release",
28
-                "vim", "tdnf",
29
-                "docker","bridge-utils",
28
+                "vim",
29
+                "docker", "bridge-utils",
30 30
                 "dracut", "dracut-tools", "rpm-ostree", "nss-altfiles", "which"]
31 31
 }