New subcommand 'container builddep'

This just downloads the build dependencies that would be installed, with
the intent to use this as a cache in a later commit.

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

src/xcp_ng_dev/cli.py

@@ -120,6 +120,22 @@ def buildparser():
     add_container_args(parser_build)
     add_common_args(parser_build)
 
+    # builddep -- fetch/cache builddep of an rpm using a container
+    parser_builddep = subparsers_container.add_parser(
+        'builddep',
+        help="Fetch dependencies for the spec file(s) found in the SPECS/ subdirectory "
+             "of the directory passed as parameter.")
+    parser_builddep.add_argument(
+        'source_dir', nargs='?', default='.',
+        help="Root path where SPECS/ and SOURCES are available. "
+             "The default is the working directory")
+    add_container_args(parser_builddep)
+    add_common_args(parser_builddep)
+    parser_builddep.add_argument(
+        'builddep_dir',
+        help="Directory where the build-dependency RPMs will be cached. "
+             "The directory is created if it doesn't exist")
+
     # run -- execute commands inside a container
     parser_run = subparsers_container.add_parser(
         'run',
@@ -156,11 +172,18 @@ def container(args):
 
     if hasattr(args, 'command') and args.command != []:
         docker_args += ["-e", "COMMAND=%s" % ' '.join(args.command)]
-    if args.action == 'build':
+    if args.action in ('build', 'builddep'):
         build_dir = os.path.abspath(args.source_dir)
-        docker_args += ["-v", f"{build_dir}:/home/builder/rpmbuild"]
-        docker_args += ["-e", "BUILD_LOCAL=1"]
         print(f"Building directory {build_dir}", file=sys.stderr)
+        docker_args += ["-v", f"{build_dir}:/home/builder/rpmbuild"]
+        match args.action:
+            case 'build':
+                docker_args += ["-e", "BUILD_LOCAL=1"]
+            case 'builddep':
+                docker_args += ["-e", "BUILD_DEPS=1"]
+            case _:
+                print(f"unhandled action {args.action}", file=sys.stderr)
+                sys.exit(1)
     if hasattr(args, 'define') and args.define:
         docker_args += ["-e", "RPMBUILD_DEFINE=%s" % args.define]
     if hasattr(args, 'rpmbuild_opts') and args.rpmbuild_opts:
@@ -174,6 +197,10 @@ def container(args):
         os.makedirs(args.output_dir, exist_ok=True)
         docker_args += ["-v", "%s:/home/builder/output" %
                         os.path.abspath(args.output_dir)]
+    if hasattr(args, 'builddep_dir') and args.builddep_dir:
+        os.makedirs(args.builddep_dir, exist_ok=True)
+        docker_args += ["-v", "%s:/home/builder/builddep" %
+                        os.path.abspath(args.builddep_dir)]
     if args.no_exit:
         docker_args += ["-e", "NO_EXIT=1"]
     if args.fail_on_error:

src/xcp_ng_dev/files/init-container.sh

@@ -67,10 +67,12 @@ ulimit -s 16384
 # get the package arch used in the container (eg. "x86_64_v2")
 RPMARCH=$(rpm -q glibc --qf "%{arch}")
 
-if [ -n "$BUILD_LOCAL" ]; then
+if [ -n "$BUILD_LOCAL$BUILD_DEPS" ]; then
     time (
         cd ~/rpmbuild
-        rm BUILD BUILDROOT RPMS SRPMS -rf
+        if [ -n "$BUILD_LOCAL" ]; then
+            rm BUILD BUILDROOT RPMS SRPMS -rf
+        fi
 
         if specs=$(ls *.spec 2>/dev/null); then
             SPECFLAGS=(
@@ -86,28 +88,40 @@ if [ -n "$BUILD_LOCAL" ]; then
 
         case "$OS_RELEASE" in
             8.2.*|8.3.*) ;; # sources always available via git-lfs
-            8.99.*|9.*) if [ -r sources ]; then alma_get_sources -i sources; fi ;;
+            8.99.*|9.*)
+                if [ -r sources ]; then alma_get_sources -i sources; fi
+                # FIXME: if [ -n "$BUILD_DEPS" ]; then exfiltrate alma_get_sources
+                ;;
             *) echo >&2 "ERROR: unknown release, cannot know package manager"; exit 1 ;;
         esac
 
-        sudo $BDEP "${SPECFLAGS[@]}" -y $specs
-
-        : ${RPMBUILD_STAGE:=a}  # default if not specified: -ba
-        RPMBUILDFLAGS=(
-            -b${RPMBUILD_STAGE} $specs
-            --target "$RPMARCH"
-            $RPMBUILD_OPTS
-            "${SPECFLAGS[@]}"
-        )
-        # in case the build deps contain xs-opam-repo, source the added profile.d file
-        [ ! -f /etc/profile.d/opam.sh ] || source /etc/profile.d/opam.sh
-        if [ $? == 0 ]; then
-            if [ -n "$RPMBUILD_DEFINE" ]; then
-                RPMBUILDFLAGS+=(--define "$RPMBUILD_DEFINE")
+        if [ -n "$BUILD_DEPS" ]; then
+            BDEPFLAGS=()
+            if [ -d ~/builddep/ ]; then
+                BDEPFLAGS+=(--downloaddir ~/builddep/)
             fi
-            rpmbuild "${RPMBUILDFLAGS[@]}"
-            if [ $? == 0 -a -d ~/output/ ]; then
-                cp -rf RPMS SRPMS ~/output/
+            sudo $BDEP "${SPECFLAGS[@]}" --downloadonly "${BDEPFLAGS[@]}" -y $specs
+        fi
+
+        if [ -n "$BUILD_LOCAL" ]; then
+            sudo $BDEP "${SPECFLAGS[@]}" -y $specs
+            : ${RPMBUILD_STAGE:=a}  # default if not specified: -ba
+            RPMBUILDFLAGS=(
+                -b${RPMBUILD_STAGE} $specs
+                --target "$RPMARCH"
+                $RPMBUILD_OPTS
+                "${SPECFLAGS[@]}"
+            )
+            # in case the build deps contain xs-opam-repo, source the added profile.d file
+            [ ! -f /etc/profile.d/opam.sh ] || source /etc/profile.d/opam.sh
+            if [ $? == 0 ]; then
+                if [ -n "$RPMBUILD_DEFINE" ]; then
+                    RPMBUILDFLAGS+=(--define "$RPMBUILD_DEFINE")
+                fi
+                rpmbuild "${RPMBUILDFLAGS[@]}"
+                if [ $? == 0 -a -d ~/output/ ]; then
+                    cp -rf RPMS SRPMS ~/output/
+                fi
             fi
         fi
     )