From 7a587ee8d140489e17e18e8b38cb31989f0bb115 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Sat, 2 Nov 2019 07:34:04 -0400 Subject: [PATCH] misc: mkosi: Switch to copy-git-more I added a new feature in mkosi which got merged in: 31801e89e77188e697ed937ca6b8668fde4c4a4d This allows us to pull in all of the git repository so that we can see the version number that comes from git. --- misc/mkosi/mkosi.default.archlinux | 3 +-- misc/mkosi/mkosi.default.centos-7 | 3 +-- misc/mkosi/mkosi.default.debian-10 | 3 +-- misc/mkosi/mkosi.default.fedora-29 | 3 +-- misc/mkosi/mkosi.default.fedora-30 | 3 +-- misc/mkosi/mkosi.default.ubuntu-bionic | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/misc/mkosi/mkosi.default.archlinux b/misc/mkosi/mkosi.default.archlinux index 4e56d9c6..72e45f35 100644 --- a/misc/mkosi/mkosi.default.archlinux +++ b/misc/mkosi/mkosi.default.archlinux @@ -46,8 +46,7 @@ Cache=mkosi.cache BuildSources=../.. # Use this transfer mode for the git sources. -# XXX: Does auto-detect even work if BuildSources is not the current dir? Bug? -SourceFileTransfer=copy-git-cached +SourceFileTransfer=copy-git-more # Skip the (second) final build phase, since we only need the build artifact. SkipFinalPhase=true diff --git a/misc/mkosi/mkosi.default.centos-7 b/misc/mkosi/mkosi.default.centos-7 index c0590b8d..714ed737 100644 --- a/misc/mkosi/mkosi.default.centos-7 +++ b/misc/mkosi/mkosi.default.centos-7 @@ -45,8 +45,7 @@ Cache=mkosi.cache BuildSources=../.. # Use this transfer mode for the git sources. -# XXX: Does auto-detect even work if BuildSources is not the current dir? Bug? -SourceFileTransfer=copy-git-cached +SourceFileTransfer=copy-git-more # Skip the (second) final build phase, since we only need the build artifact. SkipFinalPhase=true diff --git a/misc/mkosi/mkosi.default.debian-10 b/misc/mkosi/mkosi.default.debian-10 index 14fcdf26..382e5f87 100644 --- a/misc/mkosi/mkosi.default.debian-10 +++ b/misc/mkosi/mkosi.default.debian-10 @@ -42,8 +42,7 @@ Cache=mkosi.cache BuildSources=../.. # Use this transfer mode for the git sources. -# XXX: Does auto-detect even work if BuildSources is not the current dir? Bug? -SourceFileTransfer=copy-git-cached +SourceFileTransfer=copy-git-more # Skip the (second) final build phase, since we only need the build artifact. SkipFinalPhase=true diff --git a/misc/mkosi/mkosi.default.fedora-29 b/misc/mkosi/mkosi.default.fedora-29 index 18c7b3d9..195cba92 100644 --- a/misc/mkosi/mkosi.default.fedora-29 +++ b/misc/mkosi/mkosi.default.fedora-29 @@ -43,8 +43,7 @@ Cache=mkosi.cache BuildSources=../.. # Use this transfer mode for the git sources. -# XXX: Does auto-detect even work if BuildSources is not the current dir? Bug? -SourceFileTransfer=copy-git-cached +SourceFileTransfer=copy-git-more # Skip the (second) final build phase, since we only need the build artifact. SkipFinalPhase=true diff --git a/misc/mkosi/mkosi.default.fedora-30 b/misc/mkosi/mkosi.default.fedora-30 index 9d4a93d0..db73d910 100644 --- a/misc/mkosi/mkosi.default.fedora-30 +++ b/misc/mkosi/mkosi.default.fedora-30 @@ -43,8 +43,7 @@ Cache=mkosi.cache BuildSources=../.. # Use this transfer mode for the git sources. -# XXX: Does auto-detect even work if BuildSources is not the current dir? Bug? -SourceFileTransfer=copy-git-cached +SourceFileTransfer=copy-git-more # Skip the (second) final build phase, since we only need the build artifact. SkipFinalPhase=true diff --git a/misc/mkosi/mkosi.default.ubuntu-bionic b/misc/mkosi/mkosi.default.ubuntu-bionic index bb9cb865..3d4dddc0 100644 --- a/misc/mkosi/mkosi.default.ubuntu-bionic +++ b/misc/mkosi/mkosi.default.ubuntu-bionic @@ -45,8 +45,7 @@ Cache=mkosi.cache BuildSources=../.. # Use this transfer mode for the git sources. -# XXX: Does auto-detect even work if BuildSources is not the current dir? Bug? -SourceFileTransfer=copy-git-cached +SourceFileTransfer=copy-git-more # Skip the (second) final build phase, since we only need the build artifact. SkipFinalPhase=true