Skip to content

Commit bfd36df

Browse files
jslobodzianjslobodzian
committed
Merge branch '3.0-dev' into 3.0
2 parents ac6d1fa + 9f84d0e commit bfd36df

184 files changed

Lines changed: 5568 additions & 3060 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-apiserver‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-apiserver ] && mv -f /usr/bin/virt-cdi-apiserver /usr/bin/cdi-apiserver
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-apiserver
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-controller‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-controller ] && mv -f /usr/bin/virt-cdi-controller /usr/bin/cdi-controller
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-controller
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-importer‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-importer ] && mv -f /usr/bin/virt-cdi-importer /usr/bin/cdi-importer
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-importer
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-operator‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-operator ] && mv -f /usr/bin/virt-cdi-operator /usr/bin/cdi-operator
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-operator
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadproxy‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-uploadproxy ] && mv -f /usr/bin/virt-cdi-uploadproxy /usr/bin/cdi-uploadproxy
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-uploadproxy
1815

‎.pipelines/containerSourceData/cdi/Dockerfile-cdi-uploadserver‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ ARG USER
1010

1111
@INCLUDE_MAIN_RUN_INSTRUCTION@
1212

13-
# workaround till binaries rename is merged
14-
RUN [ -f /usr/bin/virt-cdi-uploadserver ] && mv -f /usr/bin/virt-cdi-uploadserver /usr/bin/cdi-uploadserver
15-
1613
#simple smoke test
1714
RUN ls /usr/bin/cdi-uploadserver
1815

‎.pipelines/containerSourceData/scripts/BuildNvidiaDriverContainers.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function get_component_name_and_version {
167167
COMPONENT="$IMAGE"
168168
echo "Component name -> $COMPONENT"
169169

170-
COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE* | rev | cut -d '.' -f 2- | rev)
170+
COMPONENT_VERSION=$(rpm -q --qf '%{VERSION}-%{release}\n' -p $HOST_MOUNTED_DIR/RPMS/x86_64/$IMAGE-[0-9]* | rev | cut -d '.' -f 2- | rev)
171171
echo "Component Version -> $COMPONENT_VERSION"
172172
}
173173

‎SPECS-EXTENDED/LibRaw/CVE-2020-15503.patch‎

Lines changed: 0 additions & 133 deletions
This file was deleted.

‎SPECS-EXTENDED/LibRaw/LibRaw-0.6.0-pkgconfig.patch‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎SPECS-EXTENDED/LibRaw/LibRaw-pkgconfig.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--- LibRaw-0.21.0/libraw.pc.in~ 2022-12-18 01:26:41.000000000 -0600
2+
+++ LibRaw-0.21.0/libraw.pc.in 2022-12-19 10:27:02.793929537 -0600
3+
@@ -6,7 +6,9 @@
4+
Name: libraw
5+
Description: Raw image decoder library (non-thread-safe)
6+
Requires: @PACKAGE_REQUIRES@
7+
+Requires.private: @PACKAGE_REQUIRES@
8+
Version: @PACKAGE_VERSION@
9+
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
10+
+Libs: -L${libdir} -lraw@PC_OPENMP@
11+
+Libs.private: -lstdc++
12+
Libs.private: @PACKAGE_LIBS_PRIVATE@
13+
Cflags: -I${includedir}/libraw -I${includedir}
14+
--- LibRaw-0.21.0/libraw_r.pc.in~ 2022-12-18 01:26:41.000000000 -0600
15+
+++ LibRaw-0.21.0/libraw_r.pc.in 2022-12-19 10:28:30.620571338 -0600
16+
@@ -6,7 +6,8 @@
17+
Name: libraw
18+
Description: Raw image decoder library (thread-safe)
19+
Requires: @PACKAGE_REQUIRES@
20+
+Requires.private: @PACKAGE_REQUIRES@
21+
Version: @PACKAGE_VERSION@
22+
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
23+
+Libs: -L${libdir} -lraw_r@PC_OPENMP@
24+
Libs.private: @PACKAGE_LIBS_PRIVATE@
25+
Cflags: -I${includedir}/libraw -I${includedir}

0 commit comments

Comments
 (0)