Merge pull request #41 from jasonbrooks/downstream

small fixes to make 7.1.3 build
CentOS · Jul 2, 2015 · 44a145e · 44a145e
2 parents 2feeeaa + 711ff13
commit 44a145e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/build_ostree_components.sh b/build_ostree_components.sh
@@ -60,7 +60,7 @@ fi
 
 ## compose a new tree, based on defs in centos-atomic-host.json
 
-rpm-ostree compose --repo=${HomeDir}/repo/ tree --add-metadata-string=version=${VERSION} ${GitDir}/centos-atomic-host.json |& tee ${BuildDir}/log.compose
+rpm-ostree compose --repo=${OstreeRepoDir} tree --add-metadata-string=version=${VERSION} ${GitDir}/centos-atomic-host.json |& tee ${BuildDir}/log.compose
 
 ## tree-signing, commented out for now
 

diff --git a/centos-atomic-host.json b/centos-atomic-host.json
@@ -75,9 +75,7 @@
     "remove-from-packages": [["yum", "/usr/bin/.*"],
 			     ["kernel", "/lib/modules/.*/drivers/gpu"],
 			     ["linux-firmware", "/usr/lib/firmware/radeon/.*"],
-			     ["filesystem", "/usr/share/backgrounds"],
-			     ["redhat-logos", "/usr/share/backgrounds", "/usr/share/kde4",
-			      "/usr/share/anaconda"]],
+			     ["filesystem", "/usr/share/backgrounds"]],
 
     "units": ["docker.service", "tuned.service", "docker-storage-setup.service"],