@@ -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"
@@ -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 - - -
@@ -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 - - -
@@ -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
@@ -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
@@ -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
@@ -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 \
@@ -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."
@@ -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
@@ -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 "/\<tmp\>/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}/
@@ -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 - -
@@ -291,13 +291,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
@@ -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
@@ -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
deleted file mode 100644
@@ -1,34 +0,0 @@
-From f405297d3382cd98391d02f397e2387da1f42879 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-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 <alex.kanavin@gmail.com>
----
- 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 ...: <unknown>
-2.17.1
-
@@ -33,7 +33,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-none-tests-x86-linux-seg_override.c-add-missing-incl.patch \