Skip to content

Commit 30301ea

Browse files
committed
Merge: kselftest: fix ynl build error
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/337 JIRA: https://issues.redhat.com/browse/RHEL-50389 Signed-off-by: Hangbin Liu <haliu@redhat.com> Approved-by: Jan Stancek <jstancek@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Approved-by: Davide Caratti <dcaratti@redhat.com> Approved-by: Paolo Abeni <pabeni@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Jan Stancek <jstancek@redhat.com>
2 parents 3912b94 + b390e2e commit 30301ea

File tree

6 files changed

+11
-3
lines changed

6 files changed

+11
-3
lines changed

tools/net/ynl/cli.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33

44
import argparse
55
import json
6+
import pathlib
67
import pprint
8+
import sys
79
import time
810

11+
sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())
912
from lib import YnlFamily, Netlink, NlError
1013

1114

tools/net/ynl/ethtool.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
import argparse
55
import json
6+
import pathlib
67
import pprint
78
import sys
89
import re
910
import os
1011

12+
sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())
1113
from lib import YnlFamily
1214

1315
def args_to_req(ynl, op_name, args, req):

tools/net/ynl/generated/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22

33
CC=gcc
4-
CFLAGS=-std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \
4+
CFLAGS += -std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \
55
-I../lib/ -idirafter $(UAPI_PATH)
66
ifeq ("$(DEBUG)","1")
77
CFLAGS += -g -fsanitize=address -fsanitize=leak -static-libasan

tools/net/ynl/lib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22

33
CC=gcc
4-
CFLAGS=-std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow
4+
CFLAGS += -std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow
55
ifeq ("$(DEBUG)","1")
66
CFLAGS += -g -fsanitize=address -fsanitize=leak -static-libasan
77
endif

tools/net/ynl/samples/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
include ../Makefile.deps
44

55
CC=gcc
6-
CFLAGS=-std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \
6+
CFLAGS += -std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \
77
-I../lib/ -I../generated/ -idirafter $(UAPI_PATH)
88
ifeq ("$(DEBUG)","1")
99
CFLAGS += -g -fsanitize=address -fsanitize=leak -static-libasan

tools/net/ynl/ynl-gen-c.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@
44
import argparse
55
import collections
66
import filecmp
7+
import pathlib
78
import os
89
import re
910
import shutil
11+
import sys
1012
import tempfile
1113
import yaml
1214

15+
sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())
1316
from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, SpecEnumEntry
1417

1518

0 commit comments

Comments
 (0)