From d93fa603a3f4493a8257da7775d6237a63a905a7 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 2 Jul 2015 10:47:33 -0700 Subject: [PATCH 1/2] fix repo path in script --- build_ostree_components.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_ostree_components.sh b/build_ostree_components.sh index 4e82a00..f2f3d8b 100755 --- 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 From 711ff13f9fcbe4ea23c0f2b40cf5df8c4f83f8d3 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 2 Jul 2015 10:48:58 -0700 Subject: [PATCH 2/2] remove extraneous remove-from-packages items --- centos-atomic-host.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/centos-atomic-host.json b/centos-atomic-host.json index 9dc3d60..1d89dfa 100644 --- 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"],