diff options
author | Tom Rini <trini@konsulko.com> | 2015-04-23 14:56:47 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-04-23 14:56:47 -0400 |
commit | d8c1d5d5fb6eafbc532982125f006e49f2c40e71 (patch) | |
tree | 3a8a16f58c8c541032f96f0989a53f57e9008184 | |
parent | 5f757cdcc6efbefec09b8f964a234f84ff9fa7f6 (diff) | |
parent | 3871cd858fcf8a00e31c2f456409afea03ce8788 (diff) | |
download | u-boot-imx-d8c1d5d5fb6eafbc532982125f006e49f2c40e71.zip u-boot-imx-d8c1d5d5fb6eafbc532982125f006e49f2c40e71.tar.gz u-boot-imx-d8c1d5d5fb6eafbc532982125f006e49f2c40e71.tar.bz2 |
Merge branch 'buildman' of git://git.denx.de/u-boot-x86
-rw-r--r-- | tools/buildman/README | 2 | ||||
-rw-r--r-- | tools/buildman/test.py | 2 | ||||
-rw-r--r-- | tools/buildman/toolchain.py | 2 | ||||
-rw-r--r-- | tools/patman/README | 6 | ||||
-rw-r--r-- | tools/patman/gitutil.py | 11 | ||||
-rw-r--r-- | tools/patman/series.py | 8 |
6 files changed, 26 insertions, 5 deletions
diff --git a/tools/buildman/README b/tools/buildman/README index e870d54..8ecdd8f 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -348,7 +348,7 @@ At the time of writing, U-Boot has these architectures: arc, arm, avr32, blackfin, m68k, microblaze, mips, nds32, nios2, openrisc powerpc, sandbox, sh, sparc, x86 -Of these, only arc, microblaze and nds32 are not available at kernel.org.. +Of these, only arc and nds32 are not available at kernel.org.. How to run it diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 7642d94..d8f3c81 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -411,7 +411,7 @@ class TestBuild(unittest.TestCase): def testToolchainDownload(self): """Test that we can download toolchains""" - self.assertEqual('https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.6.3/x86_64-gcc-4.6.3-nolibc_arm-unknown-linux-gnueabi.tar.xz', + self.assertEqual('https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/x86_64-gcc-4.9.0-nolibc_arm-unknown-linux-gnueabi.tar.xz', self.toolchains.LocateArchUrl('arm')) diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 051da11..e33e105 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -339,7 +339,7 @@ class Toolchains: """ arch = command.OutputOneLine('uname', '-m') base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['4.6.3', '4.6.2', '4.5.1', '4.2.4'] + versions = ['4.9.0', '4.6.3', '4.6.2', '4.5.1', '4.2.4'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version) diff --git a/tools/patman/README b/tools/patman/README index 7d039e8..27ec90a 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -154,7 +154,11 @@ Series-version: n Series-prefix: prefix Sets the subject prefix. Normally empty but it can be RFC for - RFC patches, or RESEND if you are being ignored. + RFC patches, or RESEND if you are being ignored. The patch subject + is like [RFC PATCH] or [RESEND PATCH]. + In the meantime, git format.subjectprefix option will be added as + well. If your format.subjectprefix is set to InternalProject, then + the patch shows like: [InternalProject][RFC/RESEND PATCH] Series-name: name Sets the name of the series. You don't need to have a name, and diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 4c2c35b..9e739d8 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -545,6 +545,17 @@ def GetDefaultUserEmail(): uemail = command.OutputOneLine('git', 'config', '--global', 'user.email') return uemail +def GetDefaultSubjectPrefix(): + """Gets the format.subjectprefix from local .git/config file. + + Returns: + Subject prefix found in local .git/config file, or None if none + """ + sub_prefix = command.OutputOneLine('git', 'config', 'format.subjectprefix', + raise_on_error=False) + + return sub_prefix + def Setup(): """Set up git utils, by reading the alias files.""" # Check for a git alias file also diff --git a/tools/patman/series.py b/tools/patman/series.py index 60ebc76..a17a7d1 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -254,6 +254,12 @@ class Series(dict): Return: Patch string, like 'RFC PATCH v5' or just 'PATCH' """ + git_prefix = gitutil.GetDefaultSubjectPrefix() + if git_prefix: + git_prefix = '%s][' % git_prefix + else: + git_prefix = '' + version = '' if self.get('version'): version = ' v%s' % self['version'] @@ -262,4 +268,4 @@ class Series(dict): prefix = '' if self.get('prefix'): prefix = '%s ' % self['prefix'] - return '%sPATCH%s' % (prefix, version) + return '%s%sPATCH%s' % (git_prefix, prefix, version) |