mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-15 06:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

image-prelink: remove assumption of sysconfdir presence

Browse Source 
If sysconfdir is not present in the image filesystem then the temporary
creation of a prelink.conf will fail. Fix this by creating sysconfdir
temporarily if needed beforehand and then remove any directories that
were created afterwards.

fixes: OpenXT OXT-1751

(From OE-Core rev: 6bf3e3db355643c4b2e20346230c09e45e519035)

Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Christopher Clark
2020-03-10 14:55:13 -07:00
committed by Richard Purdie
parent cb659c2b1d
commit 59e64ae58c
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/classes/image-prelink.bbclass
View File

@@ -17,6 +17,16 @@ prelink_image () {
pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'`
echo "Size before prelinking $pre_prelink_size." echo "Size before prelinking $pre_prelink_size."
# The filesystem may not contain sysconfdir so establish what is present
# to enable cleanup after temporary creation of sysconfdir if needed
presentdir="${IMAGE_ROOTFS}${sysconfdir}"
while [ "${IMAGE_ROOTFS}" != "${presentdir}" ] ; do
[ ! -d "${presentdir}" ] || break
presentdir=`dirname "${presentdir}"`
done
mkdir -p "${IMAGE_ROOTFS}${sysconfdir}"
# We need a prelink conf on the filesystem, add one if it's missing # We need a prelink conf on the filesystem, add one if it's missing
if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then
cp ${STAGING_ETCDIR_NATIVE}/prelink.conf \ cp ${STAGING_ETCDIR_NATIVE}/prelink.conf \
@@ -59,6 +69,13 @@ prelink_image () {
rm $ldsoconf rm $ldsoconf
fi fi
# Remove any directories temporarily created for sysconfdir
cleanupdir="${IMAGE_ROOTFS}${sysconfdir}"
while [ "${presentdir}" != "${cleanupdir}" ] ; do
rmdir "${cleanupdir}"
cleanupdir=`dirname ${cleanupdir}`
done
pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'`
echo "Size after prelinking $pre_prelink_size." echo "Size after prelinking $pre_prelink_size."
} }