summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2019-08-30 11:07:53 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2019-11-14 05:06:13 +0000
commit46116703552ca2adeda65ace8581eb4570b9cb88 (patch)
tree01a9b7240cb5eaee767f26c409482fdc270d1780 /.gitlab-ci.yml
parent39850473386d39aacf530850751caa013a6d8f0a (diff)
downloadxkeyboard-config-46116703552ca2adeda65ace8581eb4570b9cb88.tar.gz
rules: replace the merge.sh with a python script
Easier to read and comprehend, but also safer to use because it's harder to mix up the headers. Previously, the HDR file would have the list of section headers and had to be called in the right order using HDR in the file list in the Makefile.am. Let's move the section headers to the files themselves where it's more obvious if they're ever wrong and make the script include them as required. The include order is kept as-is for now so that the final evdev/base rules files are identical. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5326c2c..3d46093 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0:
variables:
- ARCH_PKGS: 'xorg-util-macros autoconf automake make gettext pkg-config gcc grep m4'
+ ARCH_PKGS: 'xorg-util-macros autoconf automake make gettext pkg-config gcc grep m4 python'
BUILDDIR: '_build'
INSTDIR: '$HOME/_inst'
CONFIGURE_ARGS: ''