tools: patch: Fix build by not modifing Makefile.am
authorHauke Mehrtens <hauke@hauke-m.de>
Sun, 14 Oct 2018 14:42:45 +0000 (16:42 +0200)
committerJo-Philipp Wich <jo@mein.io>
Tue, 18 Dec 2018 16:22:06 +0000 (17:22 +0100)
commita10c67b05727ec8b773771f60127cac39ffa90f8
tree1f434638e88fdce641e7fc22a6cf8cb8d2b99172
parent1adb3b28a9c1b3a8302a467eaa4cb07a4c5becd4
tools: patch: Fix build by not modifing Makefile.am

A new test case was adding in one of the patches fixing a problem, this
also included a change in the test/Makefile.am to add this test case.
The build system detected a change in the Makefile.am and wants to
regenerate the Makefile.in, but this fails because automake-1.15 is not
installed yet. As automake depends on patch being build first, make sure
we do not modify the Makefile.am.

This fixes build problem seen by the build bots.

Fixes: 4797dddfde6 ("patch: apply upstream cve fixes")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(backported from 759f111f8d7f2d9f5f12713fc6f48ce6422997ec)
tools/Makefile
tools/patch/patches/010-CVE-2018-1000156.patch