aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2018-09-17 17:57:37 -0500
committerAníbal Limón <anibal.limon@linaro.org>2018-09-17 17:57:37 -0500
commit18c88af07f3ca1c09215fd7ad84be3e266aa6c89 (patch)
tree3abcfff0c989cd374fa2ecd3639291fe528fe8ed
parent67d5d0761b166ff7c6d3933a43c8dc62d584a035 (diff)
downloadmeta-qcom-18c88af07f3ca1c09215fd7ad84be3e266aa6c89.tar.gz
meta-qcom-18c88af07f3ca1c09215fd7ad84be3e266aa6c89.tar.bz2
meta-qcom-18c88af07f3ca1c09215fd7ad84be3e266aa6c89.zip
recipes-test: Remove bootrr{,-init} from initramfs-bootrr-image
The bootrr and init script is now handled inside the CI integration/mainline [1] jobs so don't need to have the into meta-qcom layer. The CI integration job now gets the last bootrr version and set the initscript needed for boot the board [2][3]. [1] https://ci.linaro.org/job/lt-qcom-linux-integration/ [2] https://git.linaro.org/ci/job/configs.git/commit/?id=c7627a865 [3] https://git.linaro.org/ci/job/configs.git/commit/?id=132f0e8d0 Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
-rw-r--r--recipes-test/bootrr/bootrr.bb16
-rw-r--r--recipes-test/images/initramfs-bootrr-image.bb2
-rw-r--r--recipes-test/initrdscripts/bootrr-init.bb14
-rw-r--r--recipes-test/initrdscripts/files/init-debug.sh50
4 files changed, 1 insertions, 81 deletions
diff --git a/recipes-test/bootrr/bootrr.bb b/recipes-test/bootrr/bootrr.bb
deleted file mode 100644
index 759114c..0000000
--- a/recipes-test/bootrr/bootrr.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SUMMARY = "Boot regression testing (bootrr) for Qualcomm boards"
-SECTION = "test"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-SRCREV = "2a0a7ab0c77776810ed1d9b266ec0a59c558378e"
-SRC_URI = "git://git@github.com/andersson/${BPN}.git;branch=master;protocol=https"
-
-PV = "0.0+${SRCPV}"
-
-S = "${WORKDIR}/git"
-
-do_install() {
- oe_runmake install DESTDIR=${D} prefix=${prefix}
-}
diff --git a/recipes-test/images/initramfs-bootrr-image.bb b/recipes-test/images/initramfs-bootrr-image.bb
index d1c4859..c9abfa6 100644
--- a/recipes-test/images/initramfs-bootrr-image.bb
+++ b/recipes-test/images/initramfs-bootrr-image.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Small ramdisk image for running bootrr"
-PACKAGE_INSTALL = "bootrr-init busybox base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} qrtr-apps udev bootrr rmtfs gptfdisk lava-test-shell diag"
+PACKAGE_INSTALL = "busybox base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} qrtr-apps udev rmtfs gptfdisk lava-test-shell diag"
# Do not pollute the initrd image with rootfs features
IMAGE_FEATURES = ""
diff --git a/recipes-test/initrdscripts/bootrr-init.bb b/recipes-test/initrdscripts/bootrr-init.bb
deleted file mode 100644
index e302996..0000000
--- a/recipes-test/initrdscripts/bootrr-init.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SUMMARY = "Basic init script to launch test scripts"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-SRC_URI = "file://init-debug.sh"
-
-S = "${WORKDIR}"
-
-do_install() {
- install -m 0755 ${WORKDIR}/init-debug.sh ${D}/init
-}
-
-inherit allarch
-
-FILES_${PN} += " /init "
diff --git a/recipes-test/initrdscripts/files/init-debug.sh b/recipes-test/initrdscripts/files/init-debug.sh
deleted file mode 100644
index 2cab1e7..0000000
--- a/recipes-test/initrdscripts/files/init-debug.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-HOME=/root
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-PS1="linaro-test [rc=$(echo \$?)]# "
-export HOME PS1 PATH
-
-do_mount_fs() {
- grep -q "$1" /proc/filesystems || return
- test -d "$2" || mkdir -p "$2"
- mount -t "$1" "$1" "$2"
-}
-
-do_mknod() {
- test -e "$1" || mknod "$1" "$2" "$3" "$4"
-}
-
-mkdir -p /proc
-mount -t proc proc /proc
-
-do_mount_fs sysfs /sys
-do_mount_fs debugfs /sys/kernel/debug
-do_mount_fs devtmpfs /dev
-do_mount_fs devpts /dev/pts
-do_mount_fs tmpfs /dev/shm
-
-mkdir -p /run
-mkdir -p /var/run
-
-/sbin/udevd --daemon
-/bin/udevadm trigger
-
-do_mknod /dev/console c 5 1
-do_mknod /dev/null c 1 3
-do_mknod /dev/zero c 1 5
-
-echo -n 'BOOT TIME: '
-cat /proc/uptime
-
-if $(grep -q bootrr-auto /proc/cmdline); then
- for TEST in $(tr "\0" "\n" < /proc/device-tree/compatible); do
- if [ -x "/usr/bin/${TEST}" ]; then
- /usr/bin/${TEST}
- fi
- done
-
- echo ~~~~~~~~~~~~~~~~~~~~~
-fi
-
-exec sh </dev/console >/dev/console 2>/dev/console