Skip to content

Commit 12580d0

Browse files
Steve RamageSJrX
authored andcommitted
Resolves #244 - Make builds compatible with systemd v256
1 parent d5a0889 commit 12580d0

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

systemd-build/Systemd-Builder.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ RUN ln -fs /usr/share/zoneinfo/America/Vancouver /etc/localtime
66

77
RUN apt-get update && apt-get -y install git build-essential tzdata meson pkg-config gperf python3-jinja2 libcap-dev util-linux libmount1 libmount-dev
88

9+
910
RUN mkdir /opt/systemd-source
1011

1112
RUN git clone https://github.com/systemd/systemd.git /opt/systemd-source/systemd
1213

1314
WORKDIR /opt/systemd-source/systemd
1415

15-
RUN ./configure
16+
RUN meson setup build
1617

1718
RUN mkdir -p /mount/
1819

systemd-build/docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version : "3.9"
21
services:
32
systemd-builder:
43
build:
@@ -11,4 +10,4 @@ services:
1110
context: .
1211
dockerfile: Ubuntu-Units.Dockerfile
1312
volumes:
14-
- ./build:/mount/
13+
- ./build:/mount/

systemd-build/systemd-build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#!/usr/bin/env bash
22

3+
34
echo "Git Pull" && \
45
git pull && \
56
echo "Run jinja2" && \
6-
python3 ./tools/meson-render-jinja2.py ./build/config.h ./src/version/version.h.in ./src/core/load-fragment-gperf.gperf.in load-fragment-gperf.gperf && \
7+
python3 ./tools/meson-render-jinja2.py ./build/config.h ./src/core/load-fragment-gperf.gperf.in load-fragment-gperf.gperf && \
78
echo "Copy file(s)" && \
89
cp load-fragment-gperf.gperf /mount/load-fragment-gperf.gperf && \
910
cp -R ./man /mount/ && \
11+
git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d > /mount/last_commit_date && \
1012
echo "Reset Permissions" && \
1113
chmod 777 -R /mount

0 commit comments

Comments
 (0)