Commit Graph

27 Commits

Author SHA1 Message Date
Joshua Lock c4e2c59088 meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.

Search made with the following regex: getVar ?\(( ?[^,()]*), True\)

(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-16 10:23:23 +00:00
Jackie Huang 0f25619268 net-tools: fix building with linux-4.8
Fix a build error when using the linux-4.8 headers that results in:

In file included from
.../sysroots/qemuarm64/usr/include/linux/if_tunnel.h:6:0,
                  from iptunnel.c:39:
.../qemuarm64/usr/include/linux/ip.h:85:8: error: redefinition of
'struct iphdr'
  struct iphdr {
         ^~~~~
In file included from iptunnel.c:29:0:
.../qemuarm64/usr/include/netinet/ip.h:44:8: note: originally defined here
  struct iphdr
         ^~~~~
(From OE-Core rev: 94d15885c516e3bfee4fb68dfb568f4da6904052)

Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-10-11 08:27:27 +01:00
Shan Hai 21916fe5b6 net-tools: lib/inet6.c:INET6_rresolve() - various fixes
Integrate the commit from a70c568b90
to fix a bug which causes the 'netstat -a' to print "[UNKNOWN]" in case of
DNS problem instead of IPv6 address.

(From OE-Core rev: e99a7220bbc2d605200d5005ba40bf45f6f8dcf5)

Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-07-26 08:56:30 +01:00
Dai Caiyun 34d64f00ca net-tools: Fix rootfs creation errors
1) error: file /usr/share/man/man1/hostname.1 from install of net-tools-doc
           conflicts with file from package coreutils-doc-6.9-r5
2) error: file /usr/share/man/man1/hostname.1 from install of net-tools-doc
           conflicts with file from package coreutils-doc-8.25

(From OE-Core rev: 4c98c19d5e16193efbf6865ed53369f9ef61d9a0)

Signed-off-by: Dai Caiyun <daicy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-05-22 16:11:14 +01:00
Li Zhou 07919e948c net-tools: Add SCTP option support
Porting three net-tools SCTP related patches from
<https://archive.fedoraproject.org/pub/archive/fedora/linux/releases/
12/Fedora/source/SRPMS/net-tools-1.60-95.fc12.src.rpm> to add support
for SCTP option.

(From OE-Core rev: 45e09f33b4607317d60e8ca01ce9c8fdb55df0a0)

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-09 16:58:11 +00:00
Khem Raj a91713fde7 net-tools: Override CFLAGS/LDFLAGS in do_install too
do_compile does this but do_install needs same env as well

(From OE-Core rev: 57e4bb197173552706db60a3d82e1dddc0a6b004)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-07 00:11:38 +00:00
Khem Raj 7b6b3124db net-tools: Link with libintl on uclibc
libintl is needed explicitly on linker cmdline on uclibc since the APIs
are not in libc itelf.

Fix build on musl

(From OE-Core rev: 1eaa3e101d04fd9e73b3c680f305b35f9bb16add)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-24 09:40:27 +00:00
Li Xin 65d0bfc9ed net-tools_1.60-26.bb: Fix do_patch dependency error
When set PATCHTOOL = "patch" in conf/local.conf an error will occur
in the step of do_patch.

The error is: "quilt: command not found", so fix the missing
dependency.

(From OE-Core rev: 3cc6b73f9feaa1f09edd649060e63f5143d7cd15)

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18 11:47:03 +00:00
Alexander Kanavin aa5df2adc2 package_regex.inc: split Debian-related entries into their own recipes
(From OE-Core rev: 2a5e1848c11bd9a3c64cf8fcc0cb334c738bc5c5)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:51 +00:00
Alexander Kanavin bf362e4a8b net-tools: update to 1.60-25
This means fetching a newer Debian patchset which adds a few
bug/security fixes.

(From OE-Core rev: a729dc36754c9bf1215453270eec42aeb7708633)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-04 16:23:53 +01:00
Robert Yang 62705100f5 net-tools: fix SRC_URI
Fixed:
WARNING: Failed to fetch URL ftp://ftp.debian.org/debian/pool/main/n/net-tools/net-tools_1.60-25.diff.gz;apply=no;name=patch, attempting MIRRORS if available

(From OE-Core rev: 37481376adebab93f9c3d28a0a461c736f321ae3)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-16 17:41:59 +00:00
Richard Purdie 2b899a472a net-tools: Fix rerunning of do_patch task
Rerunning the do_patch task currently fails. The code is nearly correct
but needs to remove the quilt ".pc" directory and move the secondary
one into place in order to rerun, not move it into the .pc directory
as the code currently does.

[YOCTO #7128]

(From OE-Core rev: 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-01-23 14:32:42 +00:00
Yong Zhang be7eebef94 net-tools: ifconfig interface:0 del <IP> will remove the aliased IP on IA64
(From OE-Core rev: d96b5072d53f134c5038601e30368db6ccfefe78)

Signed-off-by: Yong Zhang <yong.zhang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-23 21:59:24 +01:00
Paul Eggleton 9f8f4fd1f9 Basic recipe formatting fixes
Fix statement indenting and spacing issues that I happened to notice.

(From OE-Core rev: d11e297b007aba625b398c52952ec929c3b02b83)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:21 +00:00
Cristian Iorga 3a8f3b8881 net-tools: upgrade to v1.60-25
(From OE-Core rev: 2277b106b947248b06a257a90420d8d69fe522f9)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-12 13:09:51 +01:00
Cristian Iorga 626dc8b989 net-tools: upgrade to v1.60-24.2
(From OE-Core rev: 8abcf2c3541d7fe96d7717cb161812784dca6c66)

Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-06 09:37:21 +00:00
Marcin Juszkiewicz 9642794ab4 net-tools: disable Token Ring and Strip support - both got removed in 3.7 kernel
(From OE-Core rev: d884974bf767cc35e3383fddcae219c8ccae6846)

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-19 17:55:01 +00:00
Marko Lindqvist 21cab67fe1 net-tools: fix license segment md5sum boundary
Replaced incorrect "startline" with correct "beginline" for telling
where license segment in file begins. Old md5sum was calculated from
the beginning of the file, not from beginning of the license segment.

(From OE-Core rev: 5037fef73e2c4d31b06a4422ad1d54f777fe00fa)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-03 14:32:45 +00:00
Saul Wold 264a6e4982 net-tools: cleanup update-alternatives deprecated code
(From OE-Core rev: f8b25d33e154173e2ce022c88563c6be872ce4b4)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:36 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Mark Hatle f517fb89c5 net-tools: Use update-alternatives
Switch to using ALTERNATIVE_LINKS to ensure the update-alternatives are setup
properly, along with the package provides.

(From OE-Core rev: 9f44708774cdcf623700b336d5a3a7bc40f91f0a)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:08 +01:00
Richard Purdie 239e8b9853 net-tools: Fix do_patch to be re-executable
This recipe's do_patch was not able to be re-executed due to its custom
patching functions. This fixes things so that it can be re-executed.

It also fixes the unpack task re-execution by ensuring ${S} is clean
before the unpack starts.

[YOCTO #2194]

(From OE-Core rev: 1cfddb17e0c2576e55f62c10612e7cbd73e5ac5e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-15 17:31:59 +01:00
Lianhao Lu e3bdc689f2 SRC_URI: Using BPN instaed of PN.
[YOCTO #1333]
In multilib cases, PN has the prefix of MLPREFIX. It is not correct to
use PN in SRC_URI. We should use the pruned BPN instead.

(From OE-Core rev: ce94fa29b81bebaaee8058f0600e111832d638f2)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-05 17:43:34 +01:00
Tom Rini 081adf9575 net-tools: Switch to using DEBIAN_MIRROR
(From OE-Core rev: ce7483796bb92a99149b9eff7e08ebc8c2805808)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:44:00 +00:00
Mark Hatle f992d6b434 recipes-extended: Add Summary information
Add Summary information and update descriptions as necessary.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-12-16 15:53:08 +00:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00