Initial commit
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
This commit is contained in:
16
package/boot/uboot-envtools/patches/001-compile.patch
Normal file
16
package/boot/uboot-envtools/patches/001-compile.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
--- a/tools/env/Makefile
|
||||
+++ b/tools/env/Makefile
|
||||
@@ -8,6 +8,13 @@
|
||||
# with "CC" here for the maximum code reuse of scripts/Makefile.host.
|
||||
override HOSTCC = $(CC)
|
||||
|
||||
+ifneq ($(TARGET_CFLAGS),)
|
||||
+KBUILD_HOSTCFLAGS = $(TARGET_CFLAGS)
|
||||
+endif
|
||||
+ifneq ($(TARGET_LDFLAGS),)
|
||||
+KBUILD_HOSTLDFLAGS = $(TARGET_LDFLAGS)
|
||||
+endif
|
||||
+
|
||||
# Compile for a hosted environment on the target
|
||||
HOST_EXTRACFLAGS = -I$(srctree)/tools \
|
||||
$(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
|
||||
@@ -0,0 +1,41 @@
|
||||
Revert "tools: env: use /run to store lockfile"
|
||||
|
||||
In OpenWRT we still use /var/lock as default location for lock files and
|
||||
/run might not even exist. Revert the upstream change and restore the
|
||||
previous default path.
|
||||
|
||||
This reverts upstream commit
|
||||
https://source.denx.de/u-boot/u-boot/-/commit/aeb40f1166e072856f865d26d42a4bea1ec3a514
|
||||
---
|
||||
tools/env/fw_env_main.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/tools/env/fw_env_main.c
|
||||
+++ b/tools/env/fw_env_main.c
|
||||
@@ -73,7 +73,7 @@ void usage_printenv(void)
|
||||
" -c, --config configuration file, default:" CONFIG_FILE "\n"
|
||||
#endif
|
||||
" -n, --noheader do not repeat variable name in output\n"
|
||||
- " -l, --lock lock node, default:/run\n"
|
||||
+ " -l, --lock lock node, default:/var/lock\n"
|
||||
"\n");
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ void usage_env_set(void)
|
||||
#ifdef CONFIG_FILE
|
||||
" -c, --config configuration file, default:" CONFIG_FILE "\n"
|
||||
#endif
|
||||
- " -l, --lock lock node, default:/run\n"
|
||||
+ " -l, --lock lock node, default:/var/lock\n"
|
||||
" -s, --script batch mode to minimize writes\n"
|
||||
"\n"
|
||||
"Examples:\n"
|
||||
@@ -206,7 +206,7 @@ int parse_setenv_args(int argc, char *ar
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
- char *lockname = "/run/" CMD_PRINTENV ".lock";
|
||||
+ char *lockname = "/var/lock/" CMD_PRINTENV ".lock";
|
||||
int lockfd = -1;
|
||||
int retval = EXIT_SUCCESS;
|
||||
char *_cmdname;
|
||||
Reference in New Issue
Block a user