File tree 4 files changed +24
-8
lines changed
4 files changed +24
-8
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ RUN yum -y update-minimal --security --sec-severity=Important --sec-severity=Cri
21
21
make \
22
22
patch \
23
23
perl \
24
- redhat-rpm-config \
25
24
yum-utils \
26
25
&& \
27
26
yum clean all -y && \
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ FROM $EXTRAPKGS as extrapkgs
3
3
# by checking for /pkgs we can cache that step
4
4
# and prepare images that already contain the packages.
5
5
RUN mkdir /pkgs
6
- RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-libelf-devel kernel-rpm-macros && rm -f *.i686.rpm # !lbbuild
6
+ RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-libelf-devel && rm -f *.i686.rpm # !lbbuild
7
7
8
8
FROM registry.access.redhat.com/ubi8/ubi
9
9
MAINTAINER Roland Kammerer <
[email protected] >
@@ -39,7 +39,7 @@ RUN yum -y update-minimal --security --sec-severity=Important --sec-severity=Cri
39
39
COPY --from=extrapkgs /pkgs /pkgs
40
40
RUN yum install -y /pkgs/*.rpm # !lbbuild
41
41
# or
42
- # =lbbuild RUN curl -fsSL https://nexus.at.linbit.com/repository/lbbuild/from_rhel_repos.sh | bash -s -- elfutils-libelf-devel kernel-rpm-macros
42
+ # =lbbuild RUN curl -fsSL https://nexus.at.linbit.com/repository/lbbuild/from_rhel_repos.sh | bash -s -- elfutils-libelf-devel
43
43
44
44
RUN rm -rf /pkgs
45
45
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ FROM $EXTRAPKGS as extrapkgs
3
3
# by checking for /pkgs we can cache that step
4
4
# and prepare images that already contain the packages.
5
5
RUN mkdir /pkgs
6
- RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-libelf-devel kernel-rpm-macros && rm -f *.i686.rpm # !lbbuild
6
+ RUN dnf install -y 'dnf-command(download)' && cd /pkgs && dnf download elfutils-libelf-devel && rm -f *.i686.rpm # !lbbuild
7
7
8
8
FROM registry.access.redhat.com/ubi9/ubi
9
9
MAINTAINER Roland Kammerer <
[email protected] >
@@ -37,7 +37,7 @@ RUN dnf -y update-minimal --security --sec-severity=Important --sec-severity=Cri
37
37
COPY --from=extrapkgs /pkgs /pkgs
38
38
RUN dnf install -y /pkgs/*.rpm # !lbbuild
39
39
# or
40
- # =lbbuild RUN curl -fsSL https://nexus.at.linbit.com/repository/lbbuild/from_rhel_repos.sh | bash -s -- elfutils-libelf-devel kernel-rpm-macros
40
+ # =lbbuild RUN curl -fsSL https://nexus.at.linbit.com/repository/lbbuild/from_rhel_repos.sh | bash -s -- elfutils-libelf-devel
41
41
42
42
RUN rm -rf /pkgs
43
43
Original file line number Diff line number Diff line change @@ -189,9 +189,26 @@ kos::rpm::bestbyrpmprovides() {
189
189
local drbd_requires_file
190
190
shift 1
191
191
192
- sort > " $kernel_provides_file " \
193
- <( find " /lib/modules/$( uname -r) " -name " symvers*" | /lib/rpm/kabi.sh) \
194
- <( find " /lib/modules/$( uname -r) /kernel" -type f | /lib/rpm/redhat/find-provides.ksyms)
192
+ local kernel_symvers
193
+ local cat_prog
194
+ if [ -e " /lib/modules/" $( uname -r) " /symvers" ]; then
195
+ kernel_symvers=" /lib/modules/" $( uname -r) " /symvers"
196
+ cat_prog=cat
197
+ elif [ -e " /lib/modules/" $( uname -r) " /symvers.gz" ]; then
198
+ kernel_symvers=" /lib/modules/" $( uname -r) " /symvers.gz"
199
+ cat_prog=zcat
200
+ elif [ -e " /lib/modules/" $( uname -r) " /symvers.xz" ]; then
201
+ kernel_symvers=" /lib/modules/" $( uname -r) " /symvers.xz"
202
+ cat_prog=xzcat
203
+ else
204
+ debug " Failed to find kernel symvers file"
205
+ return 1
206
+ fi
207
+
208
+ " $cat_prog " " $kernel_symvers " \
209
+ | awk -F" \t" ' { print "kernel(" $2 ") = " $1 }' \
210
+ | sort \
211
+ > " $kernel_provides_file "
195
212
196
213
if [ ! -s " $kernel_provides_file " ]; then
197
214
debug " Failed to generate kernel provides"
You can’t perform that action at this time.
0 commit comments