diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 581f3a7b8d..9fb8af5bf4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -11,10 +11,6 @@ USE_EXPAND="${USE_EXPAND} GO_VERSION" # Extra use flags for CoreOS SDK USE="${USE} cros_host expat -cracklib -introspection -cups -tcpd -berkdb" -# Only net-analyzer/nmap uses lua and it's compatible only with lua5-4. -LUA_SINGLE_TARGET="lua5-4" -LUA_TARGETS="lua5-4" - # Use Python 3 as the default version USE="${USE} -python_single_target_python2_7 python_single_target_python3_11" USE="${USE} -python_targets_python2_7 python_targets_python3_11" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index a05049fefd..2f0b0c111d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -21,9 +21,6 @@ sys-libs/gdbm berkdb dev-vcs/git -perl -iconv -# symlink: to add a link between ncat and nc -net-analyzer/nmap ncat symlink - # removes mta dependencies app-admin/sudo -sendmail diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults index e8cb561b71..24138b6f58 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/oem-aci/make.defaults @@ -20,14 +20,6 @@ INSTALL_MASK="${INSTALL_MASK} /usr/src " -# Exclude nmap from OEM ACI, we just want ncat/nping in there. -# Also remove ncat's second ca-bundle.crt, just use the system's. -INSTALL_MASK="${INSTALL_MASK} - /usr/bin/nmap - /usr/share/ncat - /usr/share/nmap -" - # Remove files which depend on interpreters not present in boards. INSTALL_MASK="${INSTALL_MASK} /usr/share/git/contrib/* diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults index 6a34f638ba..c9ba98cfe3 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/prod/make.defaults @@ -24,14 +24,6 @@ INSTALL_MASK="${INSTALL_MASK} /usr/src " -# Exclude nmap from prod image, we just want ncat/nping in there -# Also remove ncat's second ca-bundle.crt, just use the system's -INSTALL_MASK="${INSTALL_MASK} - /usr/bin/nmap - /usr/share/ncat - /usr/share/nmap -" - # Remove files which depend on interpreters not present in boards. INSTALL_MASK="${INSTALL_MASK} /usr/lib*/systemd/system/xfs_scrub_all*