summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-01-08 08:35:52 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-01-08 14:22:10 +0100
commit7189f3f78ddac319e9467456e43cb3f93d78e3a0 (patch)
treee6b3d031463837c406cea399109b7fcbaec37b46
parentcc1b1be44067247fffe00ae819490923443ad114 (diff)
downloadptxdist-7189f3f78ddac319e9467456e43cb3f93d78e3a0.tar.gz
ptxdist-7189f3f78ddac319e9467456e43cb3f93d78e3a0.tar.xz
libnl: remove after more than one year in staging
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/libnl-1.1/0001-libnl-1.1-undefined-ulong-max.diff.patch35
-rw-r--r--patches/libnl-1.1/0002-install-tools.patch46
-rw-r--r--patches/libnl-1.1/series2
-rw-r--r--rules/libnl.in26
-rw-r--r--rules/libnl.make94
5 files changed, 0 insertions, 203 deletions
diff --git a/patches/libnl-1.1/0001-libnl-1.1-undefined-ulong-max.diff.patch b/patches/libnl-1.1/0001-libnl-1.1-undefined-ulong-max.diff.patch
deleted file mode 100644
index f598e524d..000000000
--- a/patches/libnl-1.1/0001-libnl-1.1-undefined-ulong-max.diff.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c63a0041af095ce1be591d27401e7252a9f52ebd Mon Sep 17 00:00:00 2001
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Thu, 14 Jan 2010 09:30:56 +0100
-Subject: [PATCH 1/2] libnl-1.1-undefined-ulong-max.diff
-
-In file included from addr.c:28:
-../include/netlink-local.h: In function '__str2type':In file included from attr.c:12:
-../include/netlink-local.h: In function '__str2type':
-../include/netlink-local.h:218: error: 'ULONG_MAX' undeclared (first use in this function)
-
-This needs limits.h
-
-Patch is already in the upstream git at
-http://git.kernel.org/?p=libs/netlink/libnl.git
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- include/netlink-local.h | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/include/netlink-local.h b/include/netlink-local.h
-index 3c50ea0..d946934 100644
---- a/include/netlink-local.h
-+++ b/include/netlink-local.h
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
-
- #include <arpa/inet.h>
- #include <netdb.h>
---
-1.6.6
-
diff --git a/patches/libnl-1.1/0002-install-tools.patch b/patches/libnl-1.1/0002-install-tools.patch
deleted file mode 100644
index 613bf8382..000000000
--- a/patches/libnl-1.1/0002-install-tools.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f0108782e283725d7b6588745edeec06a8a379e5 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 14 Jan 2010 09:30:56 +0100
-Subject: [PATCH 2/2] install tools
-
-Add make targets to install the tools.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-[mk: fix to work with old coreutils]
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- Makefile.opts.in | 1 +
- src/Makefile | 6 ++++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.opts.in b/Makefile.opts.in
-index 87d229b..93467c8 100644
---- a/Makefile.opts.in
-+++ b/Makefile.opts.in
-@@ -21,6 +21,7 @@ LIBNL_LIB := @LIBNL_LIB@
- prefix := @prefix@
- exec_prefix := @exec_prefix@
- libdir := @libdir@
-+sbindir := @sbindir@
- includedir := @includedir@
- mandir := @mandir@
- sysconfdir := @sysconfdir@
-diff --git a/src/Makefile b/src/Makefile
-index ddbe29a..941bb10 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -39,7 +39,9 @@ clean:
-
- distclean: clean
-
--install:
-- @true
-+install: $(TOOLS:=-install)
-+
-+%-install: %
-+ install -m755 $< $(DESTDIR)$(sbindir)/
-
- include ../Makefile.rules
---
-1.6.6
-
diff --git a/patches/libnl-1.1/series b/patches/libnl-1.1/series
deleted file mode 100644
index 73d0100c1..000000000
--- a/patches/libnl-1.1/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-libnl-1.1-undefined-ulong-max.diff.patch
-0002-install-tools.patch
diff --git a/rules/libnl.in b/rules/libnl.in
deleted file mode 100644
index 0ea25f034..000000000
--- a/rules/libnl.in
+++ /dev/null
@@ -1,26 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=system_libraries
-
-menuconfig LIBNL
- tristate
- prompt "libnl "
- select LIBC_M
- select GCCLIBS_GCC_S
- help
- libnl is a library for applications dealing with netlink
- sockets. The library provides an interface for raw
- netlink messaging and various netlink family specific
- interfaces.
-
- STAGING: remove in ptxdist-2020.10.0
- Outdated version that is no longer maintained, and has been superseded
- by libnl3.
-
-if LIBNL
-
-config LIBNL_MONITOR
- bool
- prompt "nl-monitor"
-
-endif
diff --git a/rules/libnl.make b/rules/libnl.make
deleted file mode 100644
index 42980c38d..000000000
--- a/rules/libnl.make
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2009 by Robert Schwebel <r.schwebel@pengutronix.de>
-# 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_LIBNL) += libnl
-
-#
-# Paths and names
-#
-LIBNL_VERSION := 1.1
-LIBNL_MD5 := ae970ccd9144e132b68664f98e7ceeb1
-LIBNL := libnl-$(LIBNL_VERSION)
-LIBNL_SUFFIX := tar.gz
-LIBNL_URL := https://www.infradead.org/~tgr/libnl/files/$(LIBNL).$(LIBNL_SUFFIX)
-LIBNL_SOURCE := $(SRCDIR)/$(LIBNL).$(LIBNL_SUFFIX)
-LIBNL_DIR := $(BUILDDIR)/$(LIBNL)
-LIBNL_LICENSE := LGPL-2.1-only
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-LIBNL_PATH := PATH=$(CROSS_PATH)
-LIBNL_ENV := $(CROSS_ENV)
-
-#
-# autoconf
-#
-LIBNL_AUTOCONF := $(CROSS_AUTOCONF_USR)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/libnl.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, libnl)
- @$(call install_fixup, libnl,PRIORITY,optional)
- @$(call install_fixup, libnl,SECTION,base)
- @$(call install_fixup, libnl,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
- @$(call install_fixup, libnl,DESCRIPTION,missing)
-
- @$(call install_lib, libnl, 0, 0, 0644, libnl)
-
-ifdef PTXCONF_LIBNL_MONITOR
- @$(call install_copy, libnl, 0, 0, 0755, -, /usr/sbin/nl-monitor)
-endif
-
-# genl-ctrl-dump
-# genl-ctrl-get
-# nf-ct-dump
-# nf-log
-# nf-monitor
-# nl-addr-add
-# nl-addr-delete
-# nl-addr-dump
-# nl-fib-lookup
-# nl-link-dump
-# nl-link-ifindex2name
-# nl-link-name2ifindex
-# nl-link-set
-# nl-link-stats
-# nl-list-caches
-# nl-list-sockets
-# nl-monitor
-# nl-neigh-add
-# nl-neigh-delete
-# nl-neigh-dump
-# nl-neightbl-dump
-# nl-qdisc-add
-# nl-qdisc-delete
-# nl-qdisc-dump
-# nl-route-add
-# nl-route-del
-# nl-route-dump
-# nl-route-get
-# nl-rule-dump
-# nl-tctree-dump
-# nl-util-addr
-
- @$(call install_finish, libnl)
-
- @$(call touch)
-
-# vim: syntax=make