Merge pull request #181 from cgwalters/override-git-toplevel

cmdlib: Fix overrides when using subdir paths
coreos · Oct 19, 2018 · 9df4d65 · 9df4d65
2 parents be03106 + 8eadd67
commit 9df4d65
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/cmdlib.sh b/src/cmdlib.sh
@@ -108,13 +108,15 @@ runcompose() {
         echo "Using RPM overrides from: ${overridesdir}/rpm"
         local tmp_overridesdir=${TMPDIR}/override
         mkdir ${tmp_overridesdir}
-        local manifestdir=$(dirname ${manifest})
-        rsync -rl ${manifestdir}/ ${tmp_overridesdir}/
         cat > ${tmp_overridesdir}/coreos-assembler-override-manifest.yaml <<EOF
-include: $(basename ${manifest})
+include: ${workdir}/src/config/manifest.yaml
 repos:
   - coreos-assembler-local-overrides
 EOF
+        # Because right now rpm-ostree doesn't look for .repo files in
+        # each included dir.
+        # https://github.com/projectatomic/rpm-ostree/issues/1628
+        cp ${workdir}/src/config/*.repo ${tmp_overridesdir}/
         cat > ${tmp_overridesdir}/coreos-assembler-local-overrides.repo <<EOF
 [coreos-assembler-local-overrides]
 name=coreos-assembler-local-overrides