mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-08 05:26:58 +02:00
Revert "Install uinput module in test image only"
This reverts commit 5bf16bab5abb1cbf4f4acbc0d51d8aefa2c64091 Induced breakage: http://build.chromium.org/p/chromiumos/builders/x86%20generic%20incremental/builds/1259 Change-Id: I72170bc48cbc1cfe8b4913a9de1e5d8087525845 Reviewed-on: https://gerrit.chromium.org/gerrit/19023 Reviewed-by: Brian Harring <ferringb@chromium.org> Tested-by: Brian Harring <ferringb@chromium.org>
This commit is contained in:
parent
50420556f8
commit
c03f260bb2
@ -116,7 +116,6 @@ mod_image_for_test () {
|
|||||||
# Run test setup script to modify the image
|
# Run test setup script to modify the image
|
||||||
sudo -E GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
|
sudo -E GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
|
||||||
STATEFUL_DIR="${STATEFUL_FS_DIR}" ARCH="${ARCH}" BACKDOOR="${BACKDOOR}" \
|
STATEFUL_DIR="${STATEFUL_FS_DIR}" ARCH="${ARCH}" BACKDOOR="${BACKDOOR}" \
|
||||||
BOARD_ROOT="${BOARD_ROOT}" \
|
|
||||||
"${mod_test_script}"
|
"${mod_test_script}"
|
||||||
|
|
||||||
# Legacy parameter (used by mod_image_for_test.sh --factory)
|
# Legacy parameter (used by mod_image_for_test.sh --factory)
|
||||||
|
@ -238,7 +238,6 @@ COMMON_INSTALL_MASK="
|
|||||||
DEFAULT_INSTALL_MASK="
|
DEFAULT_INSTALL_MASK="
|
||||||
$COMMON_INSTALL_MASK
|
$COMMON_INSTALL_MASK
|
||||||
/usr/local/autotest
|
/usr/local/autotest
|
||||||
/lib/modules/*/kernel/drivers/input/misc/uinput.ko
|
|
||||||
"
|
"
|
||||||
|
|
||||||
# Mask for factory test image (build_image --factory)
|
# Mask for factory test image (build_image --factory)
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
|
|
||||||
# Use of this source code is governed by a BSD-style license that can be
|
|
||||||
# found in the LICENSE file.
|
|
||||||
#
|
|
||||||
# Add the uinput kernel module into the image for test builds.
|
|
||||||
# This is for running trackpad autotest in VM.
|
|
||||||
|
|
||||||
echo "Adding the uinput module for test builds."
|
|
||||||
MODULES_PATH="/lib/modules"
|
|
||||||
KERNEL_RELEASE=$(ls -tr "${ROOT_FS_DIR}${MODULES_PATH}" | tail -n1)
|
|
||||||
UINPUT_PATH="${MODULES_PATH}/${KERNEL_RELEASE}"/kernel/drivers/input/misc
|
|
||||||
SRC_FILE="${BOARD_ROOT}${UINPUT_PATH}"/uinput.ko
|
|
||||||
DST_DIR="${ROOT_FS_DIR}${UINPUT_PATH}"
|
|
||||||
install -m 644 "${SRC_FILE}" "${DST_DIR}"
|
|
Loading…
Reference in New Issue
Block a user