From patchwork Fri Mar 17 06:02:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 21119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 969C1C6FD1D for ; Fri, 17 Mar 2023 06:02:16 +0000 (UTC) Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by mx.groups.io with SMTP id smtpd.web11.13155.1679032934842738658 for ; Thu, 16 Mar 2023 23:02:15 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.21, mailfrom: f_l_k@t-online.de) Received: from fwd85.dcpf.telekom.de (fwd85.aul.t-online.de [10.223.144.111]) by mailout10.t-online.de (Postfix) with SMTP id 8811A4CF5C for ; Fri, 17 Mar 2023 07:02:12 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([79.219.227.8]) by fwd85.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1pd3AI-3tHaev0; Fri, 17 Mar 2023 07:02:10 +0100 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCH] Remove usage of /var/volatile/tmp Date: Fri, 17 Mar 2023 07:02:02 +0100 Message-Id: <20230317060202.385862-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1679032930-AA7F4DFF-EBE7411E/0/0 CLEAN NORMAL X-TOI-MSGID: d4a0d220-dae9-48cc-9f68-588b7ef163f2 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 17 Mar 2023 06:02:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178738 Currently /tmp is a link to /var/tmp which breaks glib-2.0 ptest Systemd documentation describes tmpdir usage as follows: /tmp/ and /var/tmp/ are two world-writable directories Linux systems provide for temporary files. The former is typically on tmpfs and thus backed by RAM/swap, and flushed out on each reboot. The latter is typically a proper, persistent file system, and thus backed by physical storage. By default, systemd-tmpfiles will apply a concept of “ageing” to all files and directories stored in /tmp/ and /var/tmp/. This means that files that have neither been changed nor read within a specific time frame are auto- matically removed in regular intervals. (This concept is not new to systemd-tmpfiles btw, it’s inherited from previous subsystems such as tmpwatch.) By default files in /tmp/ are cleaned up after 10 days, and those in /var/tmp after 30 days. This commit tries to align tmpdir to what systemd expects. Signed-off-by: Markus Volk --- meta/conf/bitbake.conf | 4 --- meta/files/fs-perms-persistent-log.txt | 2 -- meta/files/fs-perms.txt | 2 -- .../lib/oeqa/files/buildhistory_filelist1.txt | 1 - .../lib/oeqa/files/buildhistory_filelist2.txt | 1 - meta/recipes-core/base-files/base-files/fstab | 1 + .../base-files/base-files_3.0.14.bb | 4 +-- .../initscripts-1.0/populate-volatile.sh | 2 +- .../initscripts/initscripts-1.0/volatiles | 5 ++- .../initscripts/initscripts_1.0.bb | 3 -- .../systemd/systemd/00-create-volatile.conf | 4 +-- meta/recipes-core/systemd/systemd_253.1.bb | 7 ---- meta/recipes-core/udev/eudev/init | 4 --- .../e2fsprogs/e2fsprogs/run-ptest | 2 +- ...eak_cmsg.stderr.exp-adjust-tmp-paths.patch | 34 ------------------- .../valgrind/valgrind_3.20.0.bb | 1 - 16 files changed, 8 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index afd9e2f552..dcf6ce99d1 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -90,10 +90,6 @@ ROOT_HOME ??= "/home/root" # If set to boolean false ('no', 'n', 'false', 'f', '0'), /var/log is on persistent storage. VOLATILE_LOG_DIR ?= "yes" -# if set to 'yes': /tmp links to /var/tmp which links to /var/volatile/tmp -# otherwise: /tmp is on persistent storage -VOLATILE_TMP_DIR ?= "yes" - BB_RENAMED_VARIABLES[PNBLACKLIST] = "SKIP_RECIPE" BB_RENAMED_VARIABLES[CVE_CHECK_PN_WHITELIST] = "CVE_CHECK_SKIP_RECIPE" BB_RENAMED_VARIABLES[CVE_CHECK_WHITELIST] = "CVE_CHECK_IGNORE" diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt index 518c1be3c9..326c0ed092 100644 --- a/meta/files/fs-perms-persistent-log.txt +++ b/meta/files/fs-perms-persistent-log.txt @@ -47,7 +47,6 @@ ${oldincludedir} 0755 root root true 0644 root root # Links ${localstatedir}/run link /run ${localstatedir}/lock link /run/lock -${localstatedir}/tmp link volatile/tmp /home 0755 root root false - - - /srv 0755 root root false - - - @@ -57,7 +56,6 @@ ${localstatedir}/local 0755 root root false - - - # Special permissions from base-files # Set 1777 /tmp 01777 root root false - - - -${localstatedir}/volatile/tmp 01777 root root false - - - # Set 0700 ${ROOT_HOME} 0700 root root false - - - diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt index daa4aed840..ed59311035 100644 --- a/meta/files/fs-perms.txt +++ b/meta/files/fs-perms.txt @@ -48,7 +48,6 @@ ${oldincludedir} 0755 root root true 0644 root root ${localstatedir}/run link /run ${localstatedir}/log link volatile/log ${localstatedir}/lock link /run/lock -${localstatedir}/tmp link volatile/tmp /home 0755 root root false - - - /srv 0755 root root false - - - @@ -58,7 +57,6 @@ ${localstatedir}/local 0755 root root false - - - # Special permissions from base-files # Set 1777 /tmp 01777 root root false - - - -${localstatedir}/volatile/tmp 01777 root root false - - - # Set 0700 ${ROOT_HOME} 0700 root root false - - - diff --git a/meta/lib/oeqa/files/buildhistory_filelist1.txt b/meta/lib/oeqa/files/buildhistory_filelist1.txt index 8d882895ad..ec50017383 100644 --- a/meta/lib/oeqa/files/buildhistory_filelist1.txt +++ b/meta/lib/oeqa/files/buildhistory_filelist1.txt @@ -9210,5 +9210,4 @@ lrwxrwxrwx root root 12 ./var/log -> volatile/log lrwxrwxrwx root root 6 ./var/run -> ../run drwxr-xr-x root root 4096 ./var/spool drwxrwxr-x root mail 4096 ./var/spool/mail -lrwxrwxrwx root root 12 ./var/tmp -> volatile/tmp drwxr-xr-x root root 4096 ./var/volatile diff --git a/meta/lib/oeqa/files/buildhistory_filelist2.txt b/meta/lib/oeqa/files/buildhistory_filelist2.txt index ac6307060d..cedec51c38 100644 --- a/meta/lib/oeqa/files/buildhistory_filelist2.txt +++ b/meta/lib/oeqa/files/buildhistory_filelist2.txt @@ -9213,5 +9213,4 @@ lrwxrwxrwx root root 12 ./var/log -> volatile/log lrwxrwxrwx root root 6 ./var/run -> ../run drwxr-xr-x root root 4096 ./var/spool drwxrwxr-x root mail 4096 ./var/spool/mail -lrwxrwxrwx root root 12 ./var/tmp -> volatile/tmp drwxr-xr-x root root 4096 ./var/volatile diff --git a/meta/recipes-core/base-files/base-files/fstab b/meta/recipes-core/base-files/base-files/fstab index 70e400f567..7064573130 100644 --- a/meta/recipes-core/base-files/base-files/fstab +++ b/meta/recipes-core/base-files/base-files/fstab @@ -5,6 +5,7 @@ proc /proc proc defaults 0 0 devpts /dev/pts devpts mode=0620,ptmxmode=0666,gid=5 0 0 tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 tmpfs /var/volatile tmpfs defaults 0 0 +tmpfs /tmp tmpfs defaults 0 0 # uncomment this if your device has a SD/MMC/Transflash slot #/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index ff83567bd9..c2ecea0a25 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -29,7 +29,7 @@ S = "${WORKDIR}" INHIBIT_DEFAULT_DEPS = "1" docdir:append = "/${P}" -dirs1777 = "/tmp ${localstatedir}/volatile/tmp" +dirs1777 = "/tmp /var/tmp" dirs2775 = "" dirs555 = "/sys /proc" dirs755 = "/boot /dev ${base_bindir} ${base_sbindir} ${base_libdir} \ @@ -53,7 +53,7 @@ dirs755-lsb = "/srv \ ${prefix}/lib/locale" dirs2775-lsb = "/var/mail" -volatiles = "${@'log' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''} tmp" +volatiles = "${@'log' if oe.types.boolean('${VOLATILE_LOG_DIR}') else ''}" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh index bc630e871c..ecfb6fdc2b 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh @@ -23,7 +23,7 @@ ROOT_DIR="$(echo "$DIRNAME" | sed -ne 's:/etc/.*::p')" [ "$ROOTFS_READ_ONLY" = "yes" ] && VOLATILE_ENABLE_CACHE=no CFGDIR="${ROOT_DIR}/etc/default/volatiles" -TMPROOT="${ROOT_DIR}/var/volatile/tmp" +TMPROOT="${ROOT_DIR}/tmp" COREDEF="00_core" [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems." diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles index cd8a4be05f..7232a8ef90 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles +++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles @@ -25,11 +25,10 @@ # link the file defined as /var/test will actually be created as /tmp/testfile. d root root 1777 /run/lock none d root root 0755 /var/volatile/log none -d root root 1777 /var/volatile/tmp none l root root 1777 /var/lock /run/lock l root root 0755 /var/run /run -l root root 1777 /var/tmp /var/volatile/tmp -l root root 1777 /tmp /var/tmp +d root root 1777 /tmp +d root root 1777 /var/tmp d root root 0755 /var/lock/subsys none f root root 0664 /var/log/wtmp none f root root 0664 /var/run/utmp none diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 4dc477bb8d..7c9d9ca4f1 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb @@ -108,9 +108,6 @@ do_install () { sed -i -e '\@^d root root 0755 /var/volatile/log none$@ a\l root root 0755 /var/log /var/volatile/log' \ ${D}${sysconfdir}/default/volatiles/00_core fi - if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then - sed -i -e "/\/d" ${D}${sysconfdir}/default/volatiles/00_core - fi install -m 0755 ${WORKDIR}/dmesg.sh ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/logrotate-dmesg.conf ${D}${sysconfdir}/ diff --git a/meta/recipes-core/systemd/systemd/00-create-volatile.conf b/meta/recipes-core/systemd/systemd/00-create-volatile.conf index c4277221a2..1ba9b836cf 100644 --- a/meta/recipes-core/systemd/systemd/00-create-volatile.conf +++ b/meta/recipes-core/systemd/systemd/00-create-volatile.conf @@ -1,8 +1,6 @@ #This goes hand-in-hand with the base-files of OE-Core. The file must -# be sorted before 'systemd.conf' becuase this attempts to create a file +# be sorted before 'systemd.conf' because this attempts to create a file # inside /var/log. - d /run/lock 1777 - - - d /var/volatile/log - - - - -d /var/volatile/tmp 1777 - - diff --git a/meta/recipes-core/systemd/systemd_253.1.bb b/meta/recipes-core/systemd/systemd_253.1.bb index 4a0bb18254..1084040a25 100644 --- a/meta/recipes-core/systemd/systemd_253.1.bb +++ b/meta/recipes-core/systemd/systemd_253.1.bb @@ -289,13 +289,6 @@ do_install() { rm -rf ${D}${localstatedir}/log/journal/remote fi - # if the user requests /tmp be on persistent storage (i.e. not volatile) - # then don't use a tmpfs for /tmp - if [ "${VOLATILE_TMP_DIR}" != "yes" ]; then - rm -f ${D}${rootlibdir}/systemd/system/tmp.mount - rm -f ${D}${rootlibdir}/systemd/system/local-fs.target.wants/tmp.mount - fi - install -d ${D}${systemd_system_unitdir}/graphical.target.wants install -d ${D}${systemd_system_unitdir}/multi-user.target.wants install -d ${D}${systemd_system_unitdir}/poweroff.target.wants diff --git a/meta/recipes-core/udev/eudev/init b/meta/recipes-core/udev/eudev/init index 477a525b21..2084de83ae 100644 --- a/meta/recipes-core/udev/eudev/init +++ b/meta/recipes-core/udev/eudev/init @@ -79,10 +79,6 @@ case "$1" in } [ -e /dev/pts ] || mkdir -m 0755 /dev/pts [ -e /dev/shm ] || mkdir -m 1777 /dev/shm - # the automount rule for udev needs /tmp directory available, as /tmp is a symlink - # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure - # /var/volatile/tmp directory to be available. - mkdir -m 1777 -p /var/volatile/tmp # make_extra_nodes kill_udevd > "/dev/null" 2>&1 diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest index c97c0377e9..1f873b055e 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest @@ -2,7 +2,7 @@ cd ./test SKIP_SLOW_TESTS=yes ./test_script | sed -u -e '/:[[:space:]]ok/s/^/PASS: /' -e '/:[[:space:]]failed/s/^/FAIL: /' -e '/:[[:space:]]skipped/s/^/SKIP: /' -rm -rf /var/volatile/tmp/*e2fsprogs* +rm -rf /tmp/*e2fsprogs* rm -f tmp-* rm -f *.tmp rm -f *.ok diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch b/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch deleted file mode 100644 index e421ac6c80..0000000000 --- a/meta/recipes-devtools/valgrind/valgrind/0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 24 Jan 2020 17:55:39 +0100 -Subject: [PATCH] none/tests/fdleak_cmsg.stderr.exp: adjust /tmp paths - -In oe-core, /tmp is linked to /var/volatile/tmp and -valgrind output changes accordingly - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - none/tests/fdleak_cmsg.stderr.exp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/none/tests/fdleak_cmsg.stderr.exp b/none/tests/fdleak_cmsg.stderr.exp -index 6e5a797b9..0ede1ab18 100644 ---- a/none/tests/fdleak_cmsg.stderr.exp -+++ b/none/tests/fdleak_cmsg.stderr.exp -@@ -25,10 +25,10 @@ Open file descriptor ...: /dev/null - - - FILE DESCRIPTORS: 6 open (3 std) at exit. --Open file descriptor ...: /tmp/data2 -+Open file descriptor ...: ... - ... - --Open file descriptor ...: /tmp/data1 -+Open file descriptor ...: ... - ... - - Open AF_UNIX socket ...: --- -2.17.1 - diff --git a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb index 07e50426e4..4ea173ba80 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.20.0.bb @@ -36,7 +36,6 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ file://0001-memcheck-vgtests-remove-fullpath-after-flags.patch \ file://s390x_vec_op_t.patch \ - file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-docs-Disable-manual-validation.patch \ file://0001-drd-tests-Include-missing-cstdint.patch \