From 5494efe61b64c40dc5b197d8fd9732b4a3fadd98 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 18 Feb 2025 08:57:37 +0100 Subject: [PATCH] Revert "utils/brmake: add option to run in docker" All our documented uses of utils/docker-run, besides running it standalone to get an interactive shell, is to use it as a prefix to the otherwise standard command to run, e.g.: - ./utils/docker-run make foo_defconfig - ./utils/docker-run make menuconfig - ./utils/docker-run make - ./utils/docker-run make check-package Commit 8aad67f1575f (utils/brmake: add option to run in docker) departed from that usual convention, by hiding the call to docker-run inside brmake, conditioned by an environment variable. The only reason is that brmake internally used ubuffer. This is no longer the case, so we can now use brmake together with docker-run in the usual manner. This basically reverts commit 8aad67f1575f1d8a9c90ccd70302e9a6823cf794, after resolving the conflict due to the removal of unbuffer in te previous commit. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- utils/brmake | 8 +------- utils/readme.txt | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/utils/brmake b/utils/brmake index e5437d8f2c..4b9179e415 100755 --- a/utils/brmake +++ b/utils/brmake @@ -7,13 +7,7 @@ main() { start=${SECONDS} - if [ -n "$BR2_DOCKER" ]; then - docker=("${0%/*}/docker-run") - else - docker=() - fi - - ( exec 2>&1; "${docker[@]}" make "${@}"; ) \ + ( exec 2>&1; make "${@}" ) \ > >( while read -r line; do printf "%(%Y-%m-%dT%H:%M:%S)T %s\n" -1 "${line}" done \ diff --git a/utils/readme.txt b/utils/readme.txt index abff659d4f..b5862f1fb9 100644 --- a/utils/readme.txt +++ b/utils/readme.txt @@ -7,9 +7,6 @@ brmake front of each line, redirects all of the build output to a file ("'br.log' in the current directory), and just outputs the Buildroot messages (those lines starting with >>>) on stdout. - To run this within a container using docker-run (see below), set - BR2_DOCKER=y in the environment, i.e. call it as - `BR2_DOCKER=y utils/brmake`. Do not run this script for interactive configuration (e.g. menuconfig) or on an unconfigured directory. The output is redirected so you will see nothing.