Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
Signed-off-by: Roaa Sakr <[email protected]>
  • Loading branch information
romoh committed Dec 20, 2024
1 parent a9f61ca commit 9ccd272
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 31 deletions.
23 changes: 1 addition & 22 deletions toolkit/Makefile
Original file line number Diff line number Diff line change
@@ -1,35 +1,16 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

# Contains:
# - Definitions
# - High Level Targets
# - Submake Includes

######## DEFINITIONS ########

toolkit_root := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
SCRIPTS_DIR ?= $(toolkit_root)/scripts

######## SET REMAINING FLAGS ########

RUN_CHECK ?= n

# Folder defines
TOOLS_DIR ?= $(toolkit_root)/tools
TOOL_BINS_DIR ?= $(toolkit_root)/out/tools

PROJECT_ROOT ?= $(realpath $(toolkit_root)/..)
BUILD_DIR ?= $(PROJECT_ROOT)/build
OUT_DIR ?= $(PROJECT_ROOT)/out

# Sub-folder defines
# LOGS_DIR ?= $(BUILD_DIR)/logs
# CACHED_RPMS_DIR ?= $(BUILD_DIR)/rpm_cache
# STATUS_FLAGS_DIR ?= $(BUILD_DIR)/make_status
# CHROOT_DIR ?= $(BUILD_DIR)/worker/chroot
# PROFILE_DIR ?= $(BUILD_DIR)/profile

######## COMMON MAKEFILE UTILITIES ########

# Misc function defines
Expand All @@ -45,13 +26,11 @@ LOG_LEVEL ?= info
# always,auto,never
LOG_COLOR ?= auto
STOP_ON_WARNING ?= n
STOP_ON_PKG_FAIL ?= n
STOP_ON_FETCH_FAIL ?= n

######## HIGH LEVEL TARGETS ########

.PHONY: all clean
all: toolchain go-tools chroot-tools
all: go-tools

######## SUBMAKE INCLUDES ########

Expand Down
9 changes: 0 additions & 9 deletions toolkit/scripts/utils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ endef

######## VARIABLE DEPENDENCY TRACKING ########

# List of variables to watch for changes.
watch_vars=PACKAGE_BUILD_LIST PACKAGE_REBUILD_LIST PACKAGE_IGNORE_LIST REPO_LIST CONFIG_FILE STOP_ON_PKG_FAIL TOOLCHAIN_ARCHIVE REBUILD_TOOLCHAIN SRPM_PACK_LIST SPECS_DIR MAX_CASCADING_REBUILDS RUN_CHECK TEST_RUN_LIST TEST_RERUN_LIST TEST_IGNORE_LIST EXTRA_BUILD_LAYERS LICENSE_CHECK_MODE VALIDATE_TOOLCHAIN_GPG REPO_SNAPSHOT_TIME
# Current list: $(depend_PACKAGE_BUILD_LIST) $(depend_PACKAGE_REBUILD_LIST) $(depend_PACKAGE_IGNORE_LIST) $(depend_REPO_LIST) $(depend_CONFIG_FILE) $(depend_STOP_ON_PKG_FAIL)
# $(depend_TOOLCHAIN_ARCHIVE) $(depend_REBUILD_TOOLCHAIN) $(depend_SRPM_PACK_LIST) $(depend_SPECS_DIR) $(depend_EXTRA_BUILD_LAYERS) $(depend_MAX_CASCADING_REBUILDS) $(depend_RUN_CHECK) $(depend_TEST_RUN_LIST)
# $(depend_TEST_RERUN_LIST) $(depend_TEST_IGNORE_LIST) $(depend_LICENSE_CHECK_MODE) $(depend_VALIDATE_TOOLCHAIN_GPG) $(depend_REPO_SNAPSHOT_TIME)

.PHONY: variable_depends_on_phony clean-variable_depends_on_phony setfacl_always_run_phony
clean: clean-variable_depends_on_phony

Expand Down Expand Up @@ -90,9 +84,6 @@ $(STATUS_FLAGS_DIR)/$1_tracking_flag: variable_depends_on_phony
fi
endef

# Invoke the above rule for each tracked variable
$(foreach var,$(watch_vars),$(eval $(call depend_on_var,$(var))))

# Host's ACLs influence the default permissions of the
# files inside the built RPMs. Disabling them for the repository.
#
Expand Down

0 comments on commit 9ccd272

Please sign in to comment.