New --ccache option to cache build artifacts

Quite necessary for upcoming rebuilds of the kernel package.

Includes a new PATH_PREPEND interface to the container.

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

Author: ydirson

src/xcp_ng_dev/cli.py

@@ -47,6 +47,8 @@ def add_common_args(parser):
     group.add_argument('-e', '--env', action='append',
                        help='Environment variables passed directly to '
                        f'{RUNNER} -e')
+    parser.add_argument('--ccache', action='store',
+                        help="Use given directory as a cache for ccache")
     group.add_argument('-a', '--enablerepo',
                        help='additional repositories to enable before installing build dependencies. '
                        'Same syntax as yum\'s --enablerepo parameter. Available additional repositories: '
@@ -170,6 +172,12 @@ def container(args):
     if args.env:
         for env in args.env:
             docker_args += ["-e", env]
+    if args.ccache:
+        os.makedirs(args.ccache, exist_ok=True)
+        docker_args += ["-v", f"{os.path.realpath(args.ccache)}:/home/builder/ccachedir",
+                        "-e", "CCACHE_DIR=/home/builder/ccachedir",
+                        "-e", "PATH_PREPEND=/usr/lib64/ccache",
+                        ]
     if args.enablerepo:
         docker_args += ["-e", "ENABLEREPO=%s" % args.enablerepo]
     if args.disablerepo:

src/xcp_ng_dev/files/Dockerfile-9.x

@@ -15,6 +15,7 @@ RUN     dnf update -y \
         && dnf install -y \
             gcc \
             gcc-c++ \
+            ccache \
             git \
             make \
             rpm-build \

src/xcp_ng_dev/files/init-container.sh

@@ -17,6 +17,10 @@ os_release()
     )
 }
 
+if [ -n "${PATH_PREPEND}" ]; then
+    PATH="${PATH_PREPEND}:${PATH}"
+fi
+
 OS_RELEASE=$(os_release)
 
 # get list of user repos
@@ -56,6 +60,12 @@ if [ -n "$ENABLEREPO" ]; then
     sudo $CFGMGR --enable "$ENABLEREPO"
 fi
 
+# disable ccache unless its use was required
+if [ -z "$CCACHE_DIR" ]; then
+    echo >&2 "Note: uninstalling not-requested ccache"
+    sudo $DNF remove -y ccache
+fi
+
 if [ -z "$NOUPDATE" ]; then
     # update to either install newer updates or to take packages from added repos into account
     sudo $DNF update -y --disablerepo=epel