From bab652a0add532352ba0ce1a45b9477f9cfcbd57 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Mon, 7 Jan 2019 21:36:39 +0100
Subject: [PATCH] Use patch instead of quilt for the nginx patch
---
packages.yml | 2 +-
scripts/build.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/packages.yml b/packages.yml
index c794e92..9de5a7d 100644
--- a/packages.yml
+++ b/packages.yml
@@ -10,7 +10,7 @@ packages:
- patch_dir: patches/adcli
target_dir: debian
- name: nginx
- patch_dir: patches/nginx
+ patch: patches/nginx/00-add-module.patch
changelog: Add libnginx-mod-http-shibboleth
additional_content:
- git_url: "https://github.com/nginx-shib/nginx-http-shibboleth.git"
diff --git a/scripts/build.py b/scripts/build.py
index 3950bd7..d4c9260 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -25,6 +25,7 @@ EXTRACT_PATTERN = (r"extracting (?P<name>{pkg_name}) in (?P<dir>{pkg_name}-{vers
def run_checked(command, **kwargs):
+ print(command)
try:
result = sp.run(
command, check=True,
@@ -79,6 +80,9 @@ def build_package(repo_dir, package_dir, name,
abs_patch_dir = os.path.join(
repo_dir, content["patch_dir"])
apply_patches(abs_patch_dir)
+ if "patch" in content:
+ abs_patch_dir = os.path.join(repo_dir, content["patch"])
+ run_checked(["patch", "-d", ".", "-p0", abs_patch_dir])
elif "git_url" in content:
run_checked(["git", "clone", content["git_url"]])
elif "copy" in content:
--
GitLab