Skip to content

Commit

Permalink
Patchlevel 1 -> 0, for Gentoo's unipatch
Browse files Browse the repository at this point in the history
When applying patch files, Gentoo's unipatch will try patchlevel 0
first (using --dry-run) and then proceed through patchlevels 1, 2 etc.
until it finds an error-free apply, at which point it commits the
change.

This normally works fine, where patches either only modify old files, or
mix changes to old files with the creation of new ones.

However, if you have a patch that just creates a file, by default this
will come out of git format-patch at patchlevel 1, e.g.:
  /dev/null -> a/arch/arm/configs/novena_defconfig.

If you let unipatch process this, it will succeed at patchlevel 0, and
_create_ the directory 'a' in your target tree. Yuk.

Migrate patchlevel to 0, to avoid this issue.
  • Loading branch information
sakaki- committed Sep 19, 2016
1 parent f71696a commit 311f67e
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Subject: [PATCH 19/65] ARM: novena_defconfig: add default config for novena
This adds a device-specific defconfig for the Novena platform.

Signed-off-by: Sean Cross <xobs@kosagi.com>

(sakaki: patchlevel 1 -> 0, as required by Gentoo's unipatch)
---
arch/arm/configs/novena_defconfig | 5368 +++++++++++++++++++++++++++++++++++++
1 file changed, 5368 insertions(+)
Expand All @@ -15,7 +17,7 @@ diff --git a/arch/arm/configs/novena_defconfig b/arch/arm/configs/novena_defconf
new file mode 100644
index 0000000..542f40e
--- /dev/null
+++ b/arch/arm/configs/novena_defconfig
+++ arch/arm/configs/novena_defconfig
@@ -0,0 +1,5368 @@
+#
+# Automatically generated file; DO NOT EDIT.
Expand Down

0 comments on commit 311f67e

Please sign in to comment.