Initial commit
This commit is contained in:
Your Name
+39
@@ -0,0 +1,39 @@
|
||||
From c25f8d1f7a6203dfeb10b39f80ffd314bb84a58d Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 22 Dec 2016 15:26:30 +0200
|
||||
Subject: [PATCH] libc-compat.h: add musl workaround
|
||||
|
||||
The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and
|
||||
__USE_MISC) to solve conflicts with libc provided headers. This patch makes
|
||||
libc-compat.h work for musl libc as well.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Taken From:
|
||||
https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Signed-off-by: Maxin B. John <maxin.john@intel.com>
|
||||
|
||||
---
|
||||
include/uapi/linux/libc-compat.h | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
|
||||
index a159991..22198fa 100644
|
||||
--- a/include/uapi/linux/libc-compat.h
|
||||
+++ b/include/uapi/linux/libc-compat.h
|
||||
@@ -50,10 +50,12 @@
|
||||
#define _LIBC_COMPAT_H
|
||||
|
||||
/* We have included glibc headers... */
|
||||
-#if defined(__GLIBC__)
|
||||
+#if 1
|
||||
+#define __USE_MISC
|
||||
|
||||
/* Coordinate with glibc net/if.h header. */
|
||||
#if defined(_NET_IF_H) && defined(__USE_MISC)
|
||||
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
|
||||
|
||||
/* GLIBC headers included first so don't define anything
|
||||
* that would already be defined. */
|
||||
@@ -0,0 +1,103 @@
|
||||
SUMMARY = "TCP / IP networking and traffic control utilities"
|
||||
DESCRIPTION = "Iproute2 is a collection of utilities for controlling \
|
||||
TCP / IP networking and traffic control in Linux. Of the utilities ip \
|
||||
and tc are the most important. ip controls IPv4 and IPv6 \
|
||||
configuration and tc stands for traffic control."
|
||||
HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
|
||||
SECTION = "base"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
|
||||
"
|
||||
|
||||
DEPENDS = "flex-native bison-native iptables libcap"
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
|
||||
file://0001-libc-compat.h-add-musl-workaround.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732"
|
||||
|
||||
inherit update-alternatives bash-completion pkgconfig
|
||||
|
||||
PACKAGECONFIG ??= "tipc elf devlink"
|
||||
PACKAGECONFIG[tipc] = ",,libmnl,"
|
||||
PACKAGECONFIG[elf] = ",,elfutils,"
|
||||
PACKAGECONFIG[devlink] = ",,libmnl,"
|
||||
PACKAGECONFIG[rdma] = ",,libmnl,"
|
||||
PACKAGECONFIG[selinux] = ",,libselinux"
|
||||
|
||||
IPROUTE2_MAKE_SUBDIRS = "lib tc ip bridge misc genl ${@bb.utils.filter('PACKAGECONFIG', 'devlink tipc rdma', d)}"
|
||||
|
||||
# CFLAGS are computed in Makefile and reference CCOPTS
|
||||
#
|
||||
EXTRA_OEMAKE = "\
|
||||
CC='${CC}' \
|
||||
KERNEL_INCLUDE=${STAGING_INCDIR} \
|
||||
DOCDIR=${docdir}/iproute2 \
|
||||
SUBDIRS='${IPROUTE2_MAKE_SUBDIRS}' \
|
||||
SBINDIR='${base_sbindir}' \
|
||||
LIBDIR='${libdir}' \
|
||||
CCOPTS='${CFLAGS}' \
|
||||
"
|
||||
|
||||
do_configure:append () {
|
||||
sh configure ${STAGING_INCDIR}
|
||||
# Explicitly disable ATM support
|
||||
sed -i -e '/TC_CONFIG_ATM/d' config.mk
|
||||
}
|
||||
|
||||
do_install () {
|
||||
oe_runmake DESTDIR=${D} install
|
||||
mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2
|
||||
install -d ${D}${datadir}
|
||||
mv ${D}/share/* ${D}${datadir}/ || true
|
||||
rm ${D}/share -rf || true
|
||||
}
|
||||
|
||||
# The .so files in iproute2-tc are modules, not traditional libraries
|
||||
INSANE_SKIP:${PN}-tc = "dev-so"
|
||||
|
||||
IPROUTE2_PACKAGES =+ "\
|
||||
${PN}-devlink \
|
||||
${PN}-genl \
|
||||
${PN}-ifstat \
|
||||
${PN}-ip \
|
||||
${PN}-lnstat \
|
||||
${PN}-nstat \
|
||||
${PN}-routel \
|
||||
${PN}-rtacct \
|
||||
${PN}-ss \
|
||||
${PN}-tc \
|
||||
${PN}-tipc \
|
||||
${PN}-rdma \
|
||||
"
|
||||
|
||||
PACKAGE_BEFORE_PN = "${IPROUTE2_PACKAGES}"
|
||||
RDEPENDS:${PN} += "${PN}-ip"
|
||||
|
||||
FILES:${PN}-tc = "${base_sbindir}/tc* \
|
||||
${libdir}/tc/*.so"
|
||||
FILES:${PN}-lnstat = "${base_sbindir}/lnstat \
|
||||
${base_sbindir}/ctstat \
|
||||
${base_sbindir}/rtstat"
|
||||
FILES:${PN}-ifstat = "${base_sbindir}/ifstat"
|
||||
FILES:${PN}-ip = "${base_sbindir}/ip.${PN} ${sysconfdir}/iproute2"
|
||||
FILES:${PN}-genl = "${base_sbindir}/genl"
|
||||
FILES:${PN}-rtacct = "${base_sbindir}/rtacct"
|
||||
FILES:${PN}-nstat = "${base_sbindir}/nstat"
|
||||
FILES:${PN}-ss = "${base_sbindir}/ss"
|
||||
FILES:${PN}-tipc = "${base_sbindir}/tipc"
|
||||
FILES:${PN}-devlink = "${base_sbindir}/devlink"
|
||||
FILES:${PN}-rdma = "${base_sbindir}/rdma"
|
||||
FILES:${PN}-routel = "${base_sbindir}/routel"
|
||||
|
||||
RDEPENDS:${PN}-routel = "python3-core"
|
||||
|
||||
ALTERNATIVE:${PN}-ip = "ip"
|
||||
ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip"
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
|
||||
ALTERNATIVE:${PN}-tc = "tc"
|
||||
ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc"
|
||||
ALTERNATIVE_PRIORITY_${PN}-tc = "100"
|
||||
Reference in New Issue
Block a user