From 7f151af41ddf1a25b63939ef6e0cb40b351494b9 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 14 Jun 2024 15:08:43 +0100 Subject: [PATCH] Drop cros-debug eclass and USE flag The small eclass was not used anywhere. The USE flag was enabled profile-wide but was only used by the update_engine package. We can just add a regular "debug" USE flag to this package that is enabled by default instead. Signed-off-by: James Le Cuirot --- .../update_engine/update_engine-9999.ebuild | 4 ++-- .../coreos-overlay/eclass/cros-debug.eclass | 15 --------------- .../profiles/coreos/targets/generic/make.defaults | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index cc6ed4c042..82ae968ebd 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -21,7 +21,7 @@ SRC_URI="" LICENSE="BSD" SLOT="0" -IUSE="cros-debug cros_host -delta_generator symlink-usr" +IUSE="cros_host +debug -delta_generator symlink-usr" RDEPEND="!coreos-base/coreos-installer app-arch/bzip2 @@ -62,7 +62,7 @@ src_configure() { append-flags -Wno-unused-function local myconf=( - $(use_enable cros-debug debug) + $(use_enable debug) $(use_enable delta_generator) ) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass deleted file mode 100644 index 04e48f1b9a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-debug.eclass +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# -# Original Author: The Chromium OS Authors -# Purpose: Set -DNDEBUG if the cros-debug USE flag is not defined. -# - -inherit flag-o-matic - -IUSE="cros-debug" - -cros-debug-add-NDEBUG() { - use cros-debug || append-flags -DNDEBUG -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 2dc7a037d2..b2e42a0e2f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -1,7 +1,7 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -USE="cros-debug acpi usb symlink-usr cryptsetup policykit" +USE="acpi usb symlink-usr cryptsetup policykit" USE="${USE} -split-usr -cros_host -expat -cairo -X -man" USE="${USE} -acl -gpm -python" USE="${USE} -fortran -abiword -perl -cups -poppler-data"