Commit f6fa7da1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'tools-ynl-two-patches-to-ease-building-with-rpmbuild' 

Jan Stancek says:

====================
tools: ynl: two patches to ease building with rpmbuild

I'm looking to build and package ynl for Fedora and Centos Stream users.
Default rpmbuild has couple hardening options enabled by default [1][2],
which currently prevent ynl from building.

This series contains 2 small patches to address it.

[1] https://fedoraproject.org/wiki/Changes/Harden_All_Packages
[2] https://fedoraproject.org/wiki/Changes/PythonSafePath
====================

Link: https://patch.msgid.link/cover.1731399562.git.jstancek@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5c466385 05a318b4

tools/net/ynl/cli.py

+3 −0
Original line number Diff line number Diff line
@@ -3,10 +3,13 @@ 


import argparse

import json

import pathlib

import pprint

import sys

import time

import signal



sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())

from lib import YnlFamily, Netlink, NlError

tools/net/ynl/ethtool.py

+2 −0
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ 


import argparse

import json

import pathlib

import pprint

import sys

import re

import os



sys.path.append(pathlib.Path(__file__).resolve().parent.as_posix())

from lib import YnlFamily



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

tools/net/ynl/generated/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



CC=gcc

CFLAGS=-std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \

CFLAGS += -std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \

	-I../lib/ -idirafter $(UAPI_PATH)

ifeq ("$(DEBUG)","1")

  CFLAGS += -g -fsanitize=address -fsanitize=leak -static-libasan

tools/net/ynl/lib/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



CC=gcc

CFLAGS=-std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow

CFLAGS += -std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow

ifeq ("$(DEBUG)","1")

  CFLAGS += -g -fsanitize=address -fsanitize=leak -static-libasan

endif

tools/net/ynl/samples/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
include ../Makefile.deps



CC=gcc

CFLAGS=-std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \

CFLAGS += -std=gnu11 -O2 -W -Wall -Wextra -Wno-unused-parameter -Wshadow \

	-I../lib/ -I../generated/ -idirafter $(UAPI_PATH)

ifeq ("$(DEBUG)","1")

  CFLAGS += -g -fsanitize=address -fsanitize=leak -static-libasan