move libvirt to packages

Signed-off-by: Maksim Fedotov <[email protected]>

Author: nevermarine

…s/001-disable-ro-and-admin-servers.patch …s/001-disable-ro-and-admin-servers.patchimages/libvirt/patches/001-disable-ro-and-admin-servers.patch renamed to images/packages/libvirt/patches/001-disable-ro-and-admin-servers.patch images/libvirt/patches/001-disable-ro-and-admin-servers.patch renamed to images/packages/libvirt/patches/001-disable-ro-and-admin-servers.patch

@@ -1,13 +1,23 @@
+---
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}
+final: false
+fromImage: builder/scratch
+import:
+- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
+  add: /out
+  to: /{{ $.ImageName }}
+  before: setup
+
 ---
 {{- $gitRepoName := $.ImageName }}
 {{- $version := get $.Firmware $gitRepoName }}
 {{- $gitRepoUrl := "libvirt/libvirt.git" }}
 
-image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
 final: false
 fromImage: builder/src
 git:
-- add: {{ .ModuleDir }}/images/{{ .ImageName }}
+- add: {{ .ModuleDir }}/images/packages/{{ .ImageName }}
   to: /src
   includePaths:
   - patches
@@ -92,15 +102,15 @@ packages:
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
-image: {{ .ModuleNamePrefix }}{{ .ImageName }}
+image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-builder
 final: false
 fromImage: {{ eq $.SVACE_ENABLED "false" | ternary "builder/alt" "builder/alt-go-svace" }}
 import:
-- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
+- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
   add: /src/{{ $gitRepoName }}-{{ $version }}
   to: /{{ $gitRepoName }}-{{ $version }}
   before: install
-- image: {{ .ModuleNamePrefix }}{{ .ImageName }}-src-artifact
+- image: {{ .ModuleNamePrefix }}{{ .PackagePath }}/{{ .ImageName }}-src-artifact
   add: /src/patches
   to: /patches
   before: install
@@ -198,14 +208,15 @@ shell:
 
   setup:
   - |
+    OUTDIR=/out
     cd /{{ $gitRepoName }}-{{ $version }}
-    DESTDIR=/BINS ninja -C build install
-    rm -rf /BINS/var
-    rm -rf /BINS/etc/libvirt/qemu.conf
-    rm -rf /BINS/etc/libvirt/virtqemud.conf
-    find /BINS -type f -executable | while read -r execfile; do
+    DESTDIR=$OUTDIR ninja -C build install
+    rm -rf $OUTDIR/var
+    rm -rf $OUTDIR/etc/libvirt/qemu.conf
+    rm -rf $OUTDIR/etc/libvirt/virtqemud.conf
+    find $OUTDIR -type f -executable | while read -r execfile; do
     if strip "$execfile"; then
       echo "Stripped: $execfile"
     fi
     done
-
+    tree -hp $OUTDIR

…t/patches/002-auth-pid-restriction.patch …t/patches/002-auth-pid-restriction.patchimages/libvirt/patches/002-auth-pid-restriction.patch renamed to images/packages/libvirt/patches/002-auth-pid-restriction.patch images/libvirt/patches/002-auth-pid-restriction.patch renamed to images/packages/libvirt/patches/002-auth-pid-restriction.patch

@@ -35,6 +35,7 @@
 {{-      $_ := set $ctx "SVACE_ANALYZE_SSH_USER" $Root.SVACE_ANALYZE_SSH_USER }}
 {{-      $_ := set $ctx "SVACE_ANALYZE_HOST" $Root.SVACE_ANALYZE_HOST }}
 {{-      $_ := set $ctx "SVACE_IMAGE_SUFFIX" $Root.SVACE_IMAGE_SUFFIX }}
+{{-      $_ := set $ctx "Firmware" $Root.Firmware }}
 
 {{       include "module_image_template" $ctx }}
 

…reat-getpeercon-eintval-as-success.patch …reat-getpeercon-eintval-as-success.patchimages/libvirt/patches/002-treat-getpeercon-eintval-as-success.patch renamed to images/packages/libvirt/patches/002-treat-getpeercon-eintval-as-success.patch images/libvirt/patches/002-treat-getpeercon-eintval-as-success.patch renamed to images/packages/libvirt/patches/002-treat-getpeercon-eintval-as-success.patch

@@ -40,6 +40,7 @@ packages:
 - libtirpc libmd util-linux
 - pcre2
 - glibc
+- libvirt
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -60,10 +61,6 @@ import:
   add: /src/kubevirt
   to: /kubevirt
   before: install
-- image: {{ .ModuleNamePrefix }}libvirt
-  add: /BINS
-  to: /libvirt
-  before: install
 {{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 shell:
   beforeInstall:
@@ -78,7 +75,6 @@ shell:
   - |
     # Install packages
     PKGS="{{ $builderDependencies.packages | join " " }}"
-    PKGS+=" libvirt"
     for pkg in $PKGS; do
       cp -a /$pkg/. /
       rm -rf /$pkg

images/libvirt/patches/README.md images/packages/libvirt/patches/README.mdimages/libvirt/patches/README.md renamed to images/packages/libvirt/patches/README.md

@@ -131,6 +131,7 @@ packages:
 - glibc nghttp3 ngtcp2 nghttp2 libpsl libidn2 libgmp
 - openldap openssl
 - e2fsprogs libxcrypt lvm2 libjson-glib
+- libvirt
 {{- end -}}
 
 {{ $builderDependencies := include "$name" . | fromYaml }}
@@ -161,8 +162,8 @@ git:
     - nsswitch.conf
 import:
 # Libvirt and QEMU libraries and binaries
-- image: {{ .ModuleNamePrefix }}libvirt
-  add: /BINS
+- image: {{ .ModuleNamePrefix }}packages/libvirt
+  add: /libvirt
   to: /libvirt-bins
   before: install
 - image: {{ .ModuleNamePrefix }}qemu
@@ -405,11 +406,6 @@ git:
     stageDependencies:
       install:
       - '**/*'
-import:
-- image: {{ .ModuleNamePrefix }}libvirt
-  add: /BINS
-  to: /libvirt
-  before: install
 {{- include "importPackageImages" (list . $builderDependencies.packages "install") -}}
 secrets:
 - id: GOPROXY
@@ -423,7 +419,6 @@ shell:
   - |
     # Install packages
     PKGS="{{ $builderDependencies.packages | join " " }}"
-    PKGS+=" libvirt"
     for pkg in $PKGS; do
       cp -a /$pkg/. /
       rm -rf /$pkg