common: Update installation mask for factory images.
The installation mask for factory images were out-dated.
- FACTORY_TEST_INSTALL_MASK should be removed since "factory_test" image
has been deprecated by real test images.
- FACTORY_SHIM_INSTALL_MASK should be updated:
1. Whole /opt can be removed because we don't use memento updater anymore.
2. Legacy IME folder are no longer included (chewing, ibus-pinyin,
libhangul, m17n, pyzy).
3. Images from assets can be included because now we always use frecon.
4. autotest-pkgs and python2.6 no longer exists.
BUG=None
TEST=build_image factory_install
Change-Id: Ib8ce80546a3aa9ee304238a3842f8c4c05c523d5
Reviewed-on: https://chromium-review.googlesource.com/575255
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/build_image b/build_image
index 20074ca..4334b16 100755
--- a/build_image
+++ b/build_image
@@ -148,7 +148,6 @@
if ! has "systemd" "$(portageq-${FLAGS_board} envvar USE)"; then
COMMON_INSTALL_MASK+=" ${SYSTEMD_INSTALL_MASK}"
DEFAULT_INSTALL_MASK+=" ${SYSTEMD_INSTALL_MASK}"
- FACTORY_TEST_INSTALL_MASK+=" ${SYSTEMD_INSTALL_MASK}"
FACTORY_SHIM_INSTALL_MASK+=" ${SYSTEMD_INSTALL_MASK}"
INSTALL_MASK+=" ${SYSTEMD_INSTALL_MASK}"
fi
diff --git a/common.sh b/common.sh
index 9c45adb..91d8e5d 100644
--- a/common.sh
+++ b/common.sh
@@ -483,39 +483,19 @@
test_*.ko
"
-# Mask for factory test image (make_factory_toolkit.sh)
-FACTORY_TEST_INSTALL_MASK="
- ${COMMON_INSTALL_MASK}
- */.svn
- */CVS
- /usr/local/autotest/conmux
- /usr/local/build/autotest
- /usr/local/factory/bundle
- "
-
# Mask for factory install shim (build_image factory_install)
FACTORY_SHIM_INSTALL_MASK="
${DEFAULT_INSTALL_MASK}
- /opt/[^g]*
- /opt/google/chrome
- /opt/google/containers
- /opt/google/o3d
- /opt/google/talkplugin
- /usr/lib/dri
- /usr/lib/python2.6/test
+ /opt
/usr/lib64/dri
- /usr/local/autotest-pkgs
+ /usr/lib/dri
/usr/share/X11
- /usr/share/chewing
- /usr/share/chromeos-assets
+ /usr/share/chromeos-assets/[^i]*
+ /usr/share/chromeos-assets/i[^m]*
/usr/share/fonts
- /usr/share/ibus-pinyin
- /usr/share/libhangul
/usr/share/locale
- /usr/share/m17n
/usr/share/mime
/usr/share/oem
- /usr/share/pyzy
/usr/share/sounds
/usr/share/tts
/usr/share/zoneinfo