summaryrefslogtreecommitdiff
path: root/recipes-core/base-files
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/base-files')
-rw-r--r--recipes-core/base-files/base-files/fstab12
-rw-r--r--recipes-core/base-files/base-files_%.bbappend4
-rw-r--r--recipes-core/base-files/base-files_3.0.14.bbappend4
3 files changed, 6 insertions, 14 deletions
diff --git a/recipes-core/base-files/base-files/fstab b/recipes-core/base-files/base-files/fstab
deleted file mode 100644
index ab73d00..0000000
--- a/recipes-core/base-files/base-files/fstab
+++ /dev/null
@@ -1,12 +0,0 @@
-# stock fstab - you probably want to override this with a machine specific one
-
-/dev/root / auto noatime 1 1
-proc /proc proc defaults 0 0
-devpts /dev/pts devpts mode=0620,gid=5 0 0
-usbdevfs /proc/bus/usb usbdevfs noauto 0 0
-tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0
-tmpfs /var/volatile 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/recipes-core/base-files/base-files_%.bbappend b/recipes-core/base-files/base-files_%.bbappend
new file mode 100644
index 0000000..f63c02c
--- /dev/null
+++ b/recipes-core/base-files/base-files_%.bbappend
@@ -0,0 +1,4 @@
+# If hostname is empty, the /etc/hostname file is not created.
+# Prevent creating /etc/hostname file which blocks starting the
+# systemd service "set-hostname.service"
+hostname = "${@bb.utils.contains('DISTRO_FEATURES','systemd','','${MACHINE}',d)}"
diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
index 855bb4e..8faabfb 100644
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,11 +1,11 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/base-files:"
SRC_URI += " \
file://disable_systemd_coloroutput.sh \
file://x11-display-var.sh \
"
-do_install_append () {
+do_install:append () {
install -m 0755 -d ${D}${sysconfdir}/profile.d
install -m 0644 ${WORKDIR}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/
install -m 0644 ${WORKDIR}/x11-display-var.sh ${D}${sysconfdir}/profile.d/