MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

hyperstart: refresh 0001-container.c-Fix-compiler-errors-that-gcc-8.1.0-repor.patch to apply cleanly

Browse Source 
ERROR: hyperstart-v0.2+gitAUTOINC+15bb718ad3-r0 do_patch: Fuzz detected:

Applying patch 0001-container.c-Fix-compiler-errors-that-gcc-8.1.0-repor.patch
patching file src/container.c
Hunk #2 succeeded at 118 with fuzz 1 (offset 17 lines).
Hunk #3 succeeded at 148 (offset 18 lines).
Hunk #4 succeeded at 158 (offset 18 lines).
Hunk #5 succeeded at 167 with fuzz 1 (offset 18 lines).
Hunk #6 succeeded at 197 (offset 20 lines).
Hunk #7 succeeded at 222 (offset 20 lines).
Hunk #8 succeeded at 240 (offset 20 lines).
Hunk #9 succeeded at 277 (offset 20 lines).
Hunk #10 succeeded at 285 (offset 20 lines).
Hunk #11 succeeded at 325 (offset 27 lines).
Hunk #12 succeeded at 583 (offset 30 lines).
Hunk #13 succeeded at 646 (offset 30 lines).
Hunk #14 succeeded at 664 (offset 30 lines).
Hunk #15 succeeded at 749 (offset 30 lines).
Hunk #16 succeeded at 769 (offset 30 lines).
Hunk #17 succeeded at 778 (offset 30 lines).

The context lines in the patches can be updated with devtool:

    devtool modify hyperstart
    devtool finish --force-patch-refresh hyperstart <layer_path>

Don't forget to review changes done by devtool!

ERROR: hyperstart-v0.2+gitAUTOINC+15bb718ad3-r0 do_patch: QA Issue: Patch log indicates that patches do not apply cleanly. [patch-fuzz]

Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Martin Jansa 2020-04-15 21:25:44 +02:00 committed by Bruce Ashfield
parent bda5b6ab32
commit 343b5e236b
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
recipes-extended/hyperstart/hyperstart/0001-container.c-Fix-compiler-errors-that-gcc-8.1.0-repor.patch
View File

@ -1,4 +1,4 @@
From 11f5089300c1c368d896c95890827dc85a67f132 Mon Sep 17 00:00:00 2001
From 085dd65bba063e391350487f2a5e4a7bf69ee6c8 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Fri, 15 Jun 2018 08:04:35 -0700
Subject: [PATCH] container.c: Fix compiler errors that gcc 8.1.0 reports
@ -47,12 +47,13 @@ container.c:176:4: note: 'sprintf' output 9 or more bytes (assuming 520) into a
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
---
src/container.c | 47 ++++++++++++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/container.c b/src/container.c
index 0938d82..b1c52d4 100644
index fee67ff..94d49d8 100644
--- a/src/container.c
+++ b/src/container.c
@@ -22,6 +22,8 @@
@ -64,7 +65,7 @@ index 0938d82..b1c52d4 100644
static int container_populate_volume(char *src, char *dest)
{
struct stat st;
@@ -99,12 +101,12 @@ static int container_setup_volume(struct hyper_pod *pod,
@@ -116,12 +118,12 @@ static int container_setup_volume(struct hyper_pod *pod,
struct hyper_container *container)
{
int i;
@ -79,8 +80,8 @@ index 0938d82..b1c52d4 100644
+ char mountpoint[MAX_PBUF];
char *options = NULL;
const char *filevolume = NULL;
vol = &container->vols[i];
@@ -128,7 +130,8 @@ static int container_setup_volume(struct hyper_pod *pod,
bool newvolume = false;
@@ -146,7 +148,8 @@ static int container_setup_volume(struct hyper_pod *pod,
if (hyper_mount_nfs(vol->device, path) < 0)
return -1;
/* nfs export has implicitly included _data part of the volume */
@ -90,7 +91,7 @@ index 0938d82..b1c52d4 100644
} else {
fprintf(stdout, "mount %s to %s, tmp path %s\n",
dev, vol->mountpoint, path);
@@ -137,7 +140,7 @@ static int container_setup_volume(struct hyper_pod *pod,
@@ -155,7 +158,7 @@ static int container_setup_volume(struct hyper_pod *pod,
options = "nouuid";
if (access(dev, R_OK) < 0) {
@ -99,7 +100,7 @@ index 0938d82..b1c52d4 100644
sprintf(device, "/block/%s", vol->device);
hyper_netlink_wait_dev(pod->ueventfd, device);
}
@@ -146,7 +149,8 @@ static int container_setup_volume(struct hyper_pod *pod,
@@ -164,7 +167,8 @@ static int container_setup_volume(struct hyper_pod *pod,
perror("mount volume device failed");
return -1;
}
@ -108,8 +109,8 @@ index 0938d82..b1c52d4 100644
+ return -1;
}
if (container_check_file_volume(volume, &filevolume) < 0)
@@ -173,7 +177,8 @@ static int container_setup_volume(struct hyper_pod *pod,
if (container_check_volume(volume, &filevolume, &newvolume) < 0)
@@ -193,7 +197,8 @@ static int container_setup_volume(struct hyper_pod *pod,
perror("create volume file failed");
return -1;
}
@ -119,7 +120,7 @@ index 0938d82..b1c52d4 100644
/* 0777 so that any user can read/write the new file volume */
if (chmod(volume, 0777) < 0) {
fprintf(stderr, "fail to chmod directory %s\n", volume);
@@ -197,9 +202,9 @@ static int container_setup_volume(struct hyper_pod *pod,
@@ -217,9 +222,9 @@ static int container_setup_volume(struct hyper_pod *pod,
for (i = 0; i < container->maps_num; i++) {
struct stat st;
@ -131,7 +132,7 @@ index 0938d82..b1c52d4 100644
sprintf(path, "%s/%s", SHARED_DIR, map->source);
sprintf(mountpoint, "./%s", map->path);
@@ -215,7 +220,8 @@ static int container_setup_volume(struct hyper_pod *pod,
@@ -235,7 +240,8 @@ static int container_setup_volume(struct hyper_pod *pod,
}
if (map->docker) {
/* converted from volume */
@ -141,7 +142,7 @@ index 0938d82..b1c52d4 100644
src = volume;
if (container->initialize &&
(container_populate_volume(mountpoint, volume) < 0)) {
@@ -251,7 +257,7 @@ static int container_setup_modules(struct hyper_container *container)
@@ -271,7 +277,7 @@ static int container_setup_modules(struct hyper_container *container)
{
struct stat st;
struct utsname uts;
@ -150,7 +151,7 @@ index 0938d82..b1c52d4 100644
if (uname(&uts) < 0) {
perror("fail to call uname");
@@ -259,7 +265,8 @@ static int container_setup_modules(struct hyper_container *container)
@@ -279,7 +285,8 @@ static int container_setup_modules(struct hyper_container *container)
}
sprintf(src, "/lib/modules/%s", uts.release);
@ -160,7 +161,7 @@ index 0938d82..b1c52d4 100644
if (stat(dst, &st) == 0) {
struct dirent **list;
@@ -291,7 +298,7 @@ static int container_setup_modules(struct hyper_container *container)
@@ -318,7 +325,7 @@ static int container_setup_modules(struct hyper_container *container)
static int container_setup_mount(struct hyper_container *container)
{
@ -169,7 +170,7 @@ index 0938d82..b1c52d4 100644
// current dir is container rootfs, the operations on "./PATH" are the operations on container's "/PATH"
if (!container->readonly) {
@@ -546,7 +553,7 @@ static int hyper_setup_container_rootfs(void *data)
@@ -576,7 +583,7 @@ static int hyper_setup_container_rootfs(void *data)
{
struct hyper_container_arg *arg = data;
struct hyper_container *container = arg->c;
@ -178,7 +179,7 @@ index 0938d82..b1c52d4 100644
int setup_dns;
/* wait for ns-opened ready message */
@@ -609,7 +616,7 @@ static int hyper_setup_container_rootfs(void *data)
@@ -639,7 +646,7 @@ static int hyper_setup_container_rootfs(void *data)
goto fail;
}
} else {
@ -187,7 +188,7 @@ index 0938d82..b1c52d4 100644
sprintf(path, "%s/%s/", SHARED_DIR, container->image);
fprintf(stdout, "src directory %s\n", path);
@@ -627,7 +634,9 @@ static int hyper_setup_container_rootfs(void *data)
@@ -657,7 +664,9 @@ static int hyper_setup_container_rootfs(void *data)
fprintf(stdout, "root directory for container is %s/%s, init task %s\n",
root, container->rootfs, container->exec.argv[0]);
@ -198,7 +199,7 @@ index 0938d82..b1c52d4 100644
if (mount(rootfs, rootfs, NULL, MS_BIND|MS_REC, NULL) < 0) {
perror("failed to bind rootfs");
goto fail;
@@ -710,7 +719,7 @@ fail:
@@ -740,7 +749,7 @@ fail:
static int hyper_setup_pty(struct hyper_container *c)
{
@ -207,7 +208,7 @@ index 0938d82..b1c52d4 100644
sprintf(root, "/tmp/hyper/%s/devpts/", c->id);
@@ -730,7 +739,7 @@ static int hyper_setup_pty(struct hyper_container *c)
@@ -760,7 +769,7 @@ static int hyper_setup_pty(struct hyper_container *c)
static void hyper_cleanup_pty(struct hyper_container *c)
{
@ -216,7 +217,7 @@ index 0938d82..b1c52d4 100644
sprintf(path, "/tmp/hyper/%s/devpts/", c->id);
if (umount(path) < 0)
@@ -739,7 +748,7 @@ static void hyper_cleanup_pty(struct hyper_container *c)
@@ -769,7 +778,7 @@ static void hyper_cleanup_pty(struct hyper_container *c)
int container_prepare_rootfs_dev(struct hyper_container *container, struct hyper_pod *pod)
{
@ -225,6 +226,3 @@ index 0938d82..b1c52d4 100644
if (container->fstype == NULL)
return 0;
--
2.17.1