Skip to content

Commit d2fb3d9

Browse files
committed
Try another way
1 parent 700fd67 commit d2fb3d9

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

build-tools.Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ RUN set -e \
117117
&& apt install -y \
118118
autoconf \
119119
automake \
120+
bc \
120121
bison \
121122
build-essential \
122123
ca-certificates \
@@ -132,6 +133,7 @@ RUN set -e \
132133
kmod \
133134
libcurl4-openssl-dev \
134135
libbz2-dev \
136+
libelf-dev \
135137
libffi-dev \
136138
liblzma-dev \
137139
libncurses5-dev \
@@ -166,14 +168,14 @@ RUN set -e \
166168
&& git clone --depth 1 --branch v${KERNEL_VERSION} https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git \
167169
&& cd linux \
168170
&& make mrproper \
169-
&& make modules_prepare \
170-
&& make headers_install INSTALL_HDR_PATH=/tmp/kernel-headers \
171+
&& make defconfig \
172+
&& scripts/config --enable CONFIG_IKHEADERS \
173+
&& make olddefconfig \
174+
&& make modules_prepare -j \
175+
&& make KCFLAGS="-Wno-deprecated-declarations" -j 10 \
176+
&& make modules -j10 \
171177
&& mkdir -p /lib/modules/$(uname -r)/build \
172-
&& cd - \
173-
&& cd /tmp/kernel-headers \
174178
&& cp -a include arch/${KERNEL_ARCH}/include scripts Module.symvers .config Makefile /lib/modules/$(uname -r)/build/ \
175-
&& rm -rf /tmp/kernel-headers \
176-
&& cd - \
177179
&& rm -rf linux
178180

179181
# sql_exporter

compute/vm-image-spec-bookworm.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ files:
6565
# regardless of hostname (ALL)
6666
#
6767
# Also allow it to shut down the VM. The fast_import job does that when it's finished.
68-
postgres ALL=(root) NOPASSWD: /neonvm/bin/resize-swap, /neonvm/bin/set-disk-quota, /neonvm/bin/poweroff, /usr/sbin/rsyslogd, /neonvm/tools/perf, /usr/sbin/profile-bpfcc
68+
postgres ALL=(root) NOPASSWD: /neonvm/bin/resize-swap, /neonvm/bin/set-disk-quota, /neonvm/bin/poweroff, /usr/sbin/rsyslogd, /neonvm/tools/bin/perf, /usr/sbin/profile-bpfcc
6969
- filename: cgconfig.conf
7070
content: |
7171
# Configuration for cgroups in VM compute nodes
@@ -152,7 +152,7 @@ merge: |
152152
RUN set -e \
153153
&& chmod 0644 /etc/cgconfig.conf
154154
155-
ENV PERF_BINARY_PATH=/neonvm/tools/perf
155+
ENV PERF_BINARY_PATH=/neonvm/tools/bin/perf
156156
157157
158158
COPY compute_rsyslog.conf /etc/compute_rsyslog.conf

compute/vm-image-spec-bullseye.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ files:
6565
# regardless of hostname (ALL)
6666
#
6767
# Also allow it to shut down the VM. The fast_import job does that when it's finished.
68-
postgres ALL=(root) NOPASSWD: /neonvm/bin/resize-swap, /neonvm/bin/set-disk-quota, /neonvm/bin/poweroff, /usr/sbin/rsyslogd, /neonvm/tools/perf, /usr/sbin/profile-bpfcc
68+
postgres ALL=(root) NOPASSWD: /neonvm/bin/resize-swap, /neonvm/bin/set-disk-quota, /neonvm/bin/poweroff, /usr/sbin/rsyslogd, /neonvm/tools/bin/perf, /usr/sbin/profile-bpfcc
6969
- filename: cgconfig.conf
7070
content: |
7171
# Configuration for cgroups in VM compute nodes
@@ -148,7 +148,7 @@ merge: |
148148
RUN set -e \
149149
&& chmod 0644 /etc/cgconfig.conf
150150
151-
ENV PERF_BINARY_PATH=/neonvm/tools/perf
151+
ENV PERF_BINARY_PATH=/neonvm/tools/bin/perf
152152
153153
COPY compute_rsyslog.conf /etc/compute_rsyslog.conf
154154
RUN chmod 0666 /etc/compute_rsyslog.conf

0 commit comments

Comments
 (0)