CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

uml-utilities: Fix references to TMPDIR

Browse Source 
Pass CFLAGS from environment

Fixes
WARNING: uml-utilities-20040406-r1 do_package_qa: QA Issue: File /usr/lib/uml/.debug/port-helper in package uml-utilities-dbg contains reference to TMPDIR

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a1d047bae7)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2023-05-22 18:38:19 -07:00 committed by Armin Kuster
parent 2f03a5380c
commit 50b304eb30
3 changed files with 158 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-cow.c-Replace-stat64-with-stat.patch Normal file
View File

@ -0,0 +1,34 @@
From c4f85268da6c30b0aec3d9a0e951b2088887cff4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 22 May 2023 18:35:37 -0700
Subject: [PATCH] cow.c: Replace stat64 with stat
LFS64 is deprecated in latest musl and this fails to build
therefore switch to using stat API which is same as stat64 these days
Upstream-Status: Inappropriate [No upstream]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
moo/cow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/moo/cow.c
+++ b/moo/cow.c
@@ -161,7 +161,7 @@ int write_cow_header(char *cow_file, int
int sectorsize, int alignment, long long *size)
{
struct cow_header_v3 *header;
- struct stat64 buf;
+ struct stat buf;
int err;
err = cow_seek_file(fd, 0);
@@ -192,7 +192,7 @@ int write_cow_header(char *cow_file, int
backing_file))
goto out_free;
- err = stat64(header->backing_file, &buf);
+ err = stat(header->backing_file, &buf);
if(err < 0){
cow_printf("Stat of backing file '%s' failed, errno = %d\n",
header->backing_file, errno);

122
meta-oe/recipes-extended/uml-utilities/uml-utilities-20040406/0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch Normal file
View File

@ -0,0 +1,122 @@
From ac72fffe639d564f59ec1e1eafde83980acef1b5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 23 May 2023 14:40:31 -0700
Subject: [PATCH] makefiles: Append to CFLAGS instead of re-assign
This helps in inserting yocto provided CFLAGS from build environment
Upstream-Status: Inappropriate [No upstream]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
jailtest/Makefile | 2 +-
mconsole/Makefile | 2 +-
moo/Makefile | 2 +-
port-helper/Makefile | 2 +-
tunctl/Makefile | 2 +-
uml_net/Makefile | 2 +-
uml_router/Makefile | 2 +-
watchdog/Makefile | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/jailtest/Makefile b/jailtest/Makefile
index 610ca1a..025fca9 100644
--- a/jailtest/Makefile
+++ b/jailtest/Makefile
@@ -1,6 +1,6 @@
OBJS = jailtest.o
BIN = jailtest
-CFLAGS = -g -Wall
+CFLAGS += -g -Wall
BIN_DIR ?= /usr/bin
diff --git a/mconsole/Makefile b/mconsole/Makefile
index 9818d8a..74a2560 100644
--- a/mconsole/Makefile
+++ b/mconsole/Makefile
@@ -1,6 +1,6 @@
BIN = uml_mconsole
OBJS = $(BIN).o
-CFLAGS = -g -Wall
+CFLAGS += -g -Wall
BIN_DIR ?= /usr/bin
diff --git a/moo/Makefile b/moo/Makefile
index 6cdb591..60d300d 100644
--- a/moo/Makefile
+++ b/moo/Makefile
@@ -3,7 +3,7 @@ BIN = uml_moo uml_mkcow
uml_moo_OBJS = uml_moo.o cow.o
uml_mkcow_OBJS = uml_mkcow.o cow.o
-CFLAGS = -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+CFLAGS += -g -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
BIN_DIR ?= /usr/bin
diff --git a/port-helper/Makefile b/port-helper/Makefile
index 8e33bdf..8b695f3 100644
--- a/port-helper/Makefile
+++ b/port-helper/Makefile
@@ -1,6 +1,6 @@
OBJS = port-helper.o
BIN = port-helper
-CFLAGS = -g -Wall
+CFLAGS += -g -Wall
LIB_DIR ?= /usr/lib/uml
diff --git a/tunctl/Makefile b/tunctl/Makefile
index 743bfea..a39ad2b 100644
--- a/tunctl/Makefile
+++ b/tunctl/Makefile
@@ -1,6 +1,6 @@
OBJS = tunctl.o
BIN = tunctl
-CFLAGS = -g -Wall
+CFLAGS += -g -Wall
BIN_DIR ?= /usr/bin
diff --git a/uml_net/Makefile b/uml_net/Makefile
index 36efec6..2e1ad0e 100644
--- a/uml_net/Makefile
+++ b/uml_net/Makefile
@@ -1,7 +1,7 @@
TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP)
BIN = uml_net
-CFLAGS = -g -Wall $(TUNTAP)
+CFLAGS += -g -Wall $(TUNTAP)
BIN_DIR ?= /usr/bin
diff --git a/uml_router/Makefile b/uml_router/Makefile
index b7b5401..e399ea5 100644
--- a/uml_router/Makefile
+++ b/uml_router/Makefile
@@ -2,7 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP)
OBJS = hash.o port.o uml_switch.o
BIN = uml_switch
-CFLAGS = -g -Wall $(TUNTAP)
+CFLAGS += -g -Wall $(TUNTAP)
BIN_DIR ?= /usr/bin
diff --git a/watchdog/Makefile b/watchdog/Makefile
index c26fd9f..5178cc6 100644
--- a/watchdog/Makefile
+++ b/watchdog/Makefile
@@ -1,6 +1,6 @@
BIN = uml_watchdog
OBJS = $(BIN).o
-CFLAGS = -g -Wall
+CFLAGS += -g -Wall
BIN_DIR ?= /usr/bin
--
2.40.1

2
meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb
View File

@ -8,6 +8,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_
file://unstrip.patch \
file://0001-include-required-system-header-files-for-fd_set-and-.patch \
file://0001-Add-missing-standard-headers-for-str-and-exit-APIs.patch \
file://0001-cow.c-Replace-stat64-with-stat.patch \
file://0001-makefiles-Append-to-CFLAGS-instead-of-re-assign.patch \
"
SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a"
SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41"