aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <ndechesne@users.noreply.github.com>2019-02-22 18:14:49 +0100
committerGitHub <noreply@github.com>2019-02-22 18:14:49 +0100
commit622ee4edc4c736f376836924c9a5d23f17c4ae40 (patch)
tree5c8c2dc3edf0ec27304a0510eaabfa0e5d07a7e2
parent38db19b96887cf1e111ecf4157fe21260412a24a (diff)
parent9db2ced742a536fdb6eca86d6dd29b56513f697b (diff)
downloadmeta-qcom-622ee4edc4c736f376836924c9a5d23f17c4ae40.tar.gz
meta-qcom-622ee4edc4c736f376836924c9a5d23f17c4ae40.tar.bz2
meta-qcom-622ee4edc4c736f376836924c9a5d23f17c4ae40.zip
Merge pull request #94 from alimon/master
Improvements initramfs-bootrr-image, systemd, autologin and rename
-rw-r--r--recipes-test/images/initramfs-bootrr-image.bb34
-rw-r--r--recipes-test/images/initramfs-test-image.bb47
2 files changed, 47 insertions, 34 deletions
diff --git a/recipes-test/images/initramfs-bootrr-image.bb b/recipes-test/images/initramfs-bootrr-image.bb
deleted file mode 100644
index d813865..0000000
--- a/recipes-test/images/initramfs-bootrr-image.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Small ramdisk image for running bootrr"
-
-PACKAGE_INSTALL = " \
- ${ROOTFS_BOOTSTRAP_INSTALL} \
- busybox \
- base-passwd \
- devmem2 \
- diag \
- ethtool \
- gptfdisk \
- iperf2 \
- iperf3 \
- qrtr-apps \
- lava-test-shell \
- rmtfs \
- tcpdump \
- udev \
-"
-
-# Do not pollute the initrd image with rootfs features
-IMAGE_FEATURES = ""
-
-export IMAGE_BASENAME = "initramfs-bootrr-image"
-IMAGE_LINGUAS = ""
-
-LICENSE = "MIT"
-
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-IMAGE_ROOTFS_EXTRA_SPACE = "0"
-
-BAD_RECOMMENDATIONS += "busybox-syslog"
diff --git a/recipes-test/images/initramfs-test-image.bb b/recipes-test/images/initramfs-test-image.bb
new file mode 100644
index 0000000..83ef315
--- /dev/null
+++ b/recipes-test/images/initramfs-test-image.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "Small ramdisk image for running tests (bootrr, etc)"
+
+PACKAGE_INSTALL = " \
+ ${ROOTFS_BOOTSTRAP_INSTALL} \
+ busybox \
+ base-passwd \
+ devmem2 \
+ diag \
+ ethtool \
+ gptfdisk \
+ iperf2 \
+ iperf3 \
+ lava-test-shell \
+ packagegroup-core-boot \
+ qrtr-apps \
+ rmtfs \
+ tcpdump \
+ udev \
+"
+
+# Do not pollute the initrd image with rootfs features
+IMAGE_FEATURES = "debug-tweaks"
+
+export IMAGE_BASENAME = "initramfs-test-image"
+IMAGE_LINGUAS = ""
+
+LICENSE = "MIT"
+
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
+# Disable installation of kernel and modules via packagegroup-core-boot
+NO_RECOMMENDATIONS = "1"
+
+# Enable local auto-login (on systemd) of the root user (local = serial port and
+# virtual console by default, can be configured).
+LOCAL_GETTY ?= " \
+ ${IMAGE_ROOTFS}${systemd_system_unitdir}/serial-getty@.service \
+ ${IMAGE_ROOTFS}${systemd_system_unitdir}/getty@.service \
+"
+local_autologin () {
+ sed -i -e 's/^\(ExecStart *=.*getty \)/\1--autologin root /' ${LOCAL_GETTY}
+}
+ROOTFS_POSTPROCESS_COMMAND += "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'local_autologin;', '', d)}"