Remove ccache
This patch removes the ccache handling from the base element. For mostly all systems this was never used at all. This is working towards the removal of the base element from DIB Change-Id: Ieb16ef612ebd98470993dcd6f55b3a22d37084ba Signed-off-by: Andreas Florath <andreas@florath.net>
This commit is contained in:
parent
634e9ac043
commit
b107606a75
@ -26,9 +26,3 @@ Notes:
|
|||||||
being missing, consider installing/generating the relevant locale.
|
being missing, consider installing/generating the relevant locale.
|
||||||
This may be as simple as having language-pack-XX installed in the
|
This may be as simple as having language-pack-XX installed in the
|
||||||
pre-install stage
|
pre-install stage
|
||||||
|
|
||||||
* This element ensures /tmp/ccache will be available in the chroot
|
|
||||||
during the root, extra-data, pre-install, install and post-install
|
|
||||||
stages. /tmp/ccache is unavailable during block-device, finalise
|
|
||||||
and cleanup stages as it will have been automatically unmounted
|
|
||||||
by then.
|
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
||||||
set -x
|
|
||||||
fi
|
|
||||||
set -eu
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
# As this is run in cleanup, it's already been automatically unmounted,
|
|
||||||
# so all we need to do here is remove the directory
|
|
||||||
sudo rmdir $TMP_MOUNT_PATH/tmp/ccache || true
|
|
@ -1,7 +0,0 @@
|
|||||||
# Put ccache in path for known compilers
|
|
||||||
for CCACHEDIR in "/usr/lib/ccache" "/usr/lib64/ccache" ; do
|
|
||||||
if ! [[ "$PATH" =~ "$CCACHEDIR" ]] ; then
|
|
||||||
export PATH=$CCACHEDIR:$PATH
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
export CCACHE_DIR=/tmp/ccache
|
|
@ -1 +0,0 @@
|
|||||||
ccache_package:
|
|
@ -4,7 +4,6 @@
|
|||||||
"iscsi_package": "iscsi-initiator-utils"
|
"iscsi_package": "iscsi-initiator-utils"
|
||||||
},
|
},
|
||||||
"gentoo": {
|
"gentoo": {
|
||||||
"ccache_package": "dev-util/ccache",
|
|
||||||
"curl": "net-misc/curl",
|
"curl": "net-misc/curl",
|
||||||
"dhcp_client": "net-misc/dhcp",
|
"dhcp_client": "net-misc/dhcp",
|
||||||
"extlinux": "sys-boot/syslinux",
|
"extlinux": "sys-boot/syslinux",
|
||||||
@ -26,7 +25,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"default": {
|
"default": {
|
||||||
"ccache_package": "ccache",
|
|
||||||
"iscsi_package": "open-iscsi"
|
"iscsi_package": "open-iscsi"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
||||||
set -x
|
|
||||||
fi
|
|
||||||
set -eu
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
# Don't do anything if already mounted (if disk-image-create is invoked with
|
|
||||||
# no elements specified, this hook actually fires twice, once during
|
|
||||||
# `run_d root` for the base element, then again when `run_d root` is called
|
|
||||||
# after automatically pulling in the Ubuntu element)
|
|
||||||
grep " $TMP_MOUNT_PATH/tmp/ccache" /proc/mounts && exit
|
|
||||||
|
|
||||||
DIB_CCACHE_DIR=${DIB_CCACHE_DIR:-$DIB_IMAGE_CACHE/ccache}
|
|
||||||
mkdir -p $DIB_CCACHE_DIR
|
|
||||||
|
|
||||||
sudo mkdir -p $TMP_MOUNT_PATH/tmp/ccache
|
|
||||||
sudo mount --bind $DIB_CCACHE_DIR $TMP_MOUNT_PATH/tmp/ccache
|
|
@ -6,4 +6,7 @@ fi
|
|||||||
set -eu
|
set -eu
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
echo "ccache dkms" > /tmp/yum-blacklist
|
# This is packages that are required for installation by other
|
||||||
|
# elements (like base) but aren't actually available for this
|
||||||
|
# platform. This is a bit of a hack
|
||||||
|
echo "dkms" > /tmp/yum-blacklist
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
||||||
set -x
|
|
||||||
fi
|
|
||||||
set -eu
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
# Setup ccache symlinks, as openSUSE's ccache package doesn't
|
|
||||||
# include them.
|
|
||||||
mkdir -p /usr/lib/ccache
|
|
||||||
for tool in cc gcc; do
|
|
||||||
ln -s /usr/bin/ccache /usr/lib/ccache/$tool
|
|
||||||
done
|
|
@ -32,12 +32,6 @@ source-repositories
|
|||||||
Git repositories and tarballs obtained via the
|
Git repositories and tarballs obtained via the
|
||||||
:doc:`../elements/source-repositories/README` element will be cached.
|
:doc:`../elements/source-repositories/README` element will be cached.
|
||||||
|
|
||||||
C and C++ compilation
|
|
||||||
---------------------
|
|
||||||
|
|
||||||
Ccache is configured by the :doc:`../elements/base/README` element. Any
|
|
||||||
compilation that honours ccache will be cached.
|
|
||||||
|
|
||||||
PyPI
|
PyPI
|
||||||
----
|
----
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user