[LEDE-DEV] [PATCH 2/2] ltq-atm: cleanup unused variables and functions
From: Martin Schiller
Signed-off-by: Martin Schiller
---
package/kernel/lantiq/ltq-atm/src/ltq_atm.c | 41 -
1 file changed, 41 deletions(-)
diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
index f306d19364fd..0b9d7a05aba0 100644
--- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
+++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
@@ -191,8 +191,6 @@ struct sk_buff* atm_alloc_tx(struct atm_vcc *, unsigned
int);
static inline void atm_free_tx_skb_vcc(struct sk_buff *, struct atm_vcc *);
static inline struct sk_buff *get_skb_rx_pointer(unsigned int);
static inline int get_tx_desc(unsigned int);
-static struct sk_buff* skb_duplicate(struct sk_buff *);
-static struct sk_buff* skb_break_away_from_protocol(struct sk_buff *);
/*
* mailbox handler and signal function
@@ -523,7 +521,6 @@ static int ppe_send(struct atm_vcc *vcc, struct sk_buff
*skb)
unsigned long flags;
struct tx_descriptor reg_desc = {0};
struct tx_inband_header *header;
- struct sk_buff *new_skb;
if ( vcc == NULL || skb == NULL )
return -EINVAL;
@@ -856,44 +853,6 @@ static inline int get_tx_desc(unsigned int conn)
return desc_base;
}
-static struct sk_buff* skb_duplicate(struct sk_buff *skb)
-{
- struct sk_buff *new_skb;
-
- new_skb = alloc_skb_tx(skb->len);
- if ( new_skb == NULL )
- return NULL;
-
- skb_put(new_skb, skb->len);
- memcpy(new_skb->data, skb->data, skb->len);
-
- return new_skb;
-}
-
-static struct sk_buff* skb_break_away_from_protocol(struct sk_buff *skb)
-{
- struct sk_buff *new_skb;
-
- if ( skb_shared(skb) ) {
- new_skb = skb_clone(skb, GFP_ATOMIC);
- if ( new_skb == NULL )
- return NULL;
- } else
- new_skb = skb_get(skb);
-
- skb_dst_drop(new_skb);
-#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
- nf_conntrack_put(new_skb->nfct);
- new_skb->nfct = NULL;
- #ifdef CONFIG_BRIDGE_NETFILTER
- nf_bridge_put(new_skb->nf_bridge);
- new_skb->nf_bridge = NULL;
- #endif
-#endif
-
- return new_skb;
-}
-
static void free_tx_ring(unsigned int queue)
{
unsigned long flags;
--
2.15.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/2] ltq-atm: rewrite tx path to use IRQs
The ATM subsystem is different from the generic ethernet NICs. The ATM
subsystem requires a callback when a packet has been sent. It means a
tx skb_buff need to be used after it has sent. While the generic NIC
can fill up the TX ring and free skb_buffs if it encounter a ring buffer slot
with an already sent skbuff.
The ATM drivers need call the pop() function after it has send a
single ATM package. The ATM subsystem controls via this ways the queuing.
The ppe engine use DMA channels for read and write. Every atm_vcc has it's
own TX DMA channel and each TX DMA channel has it's own ring buffer.
The old driver had multiple issues:
- Call the subsystem callback at the beginning of tx function (ppe_send).
Didn't allowed the ATM subsystem to control the enqueued package
amount.
- Filled up the TX ring until full and fail futher
- copy or decouple the skb from all other subsystem before giving it
over to TX ring
The new tx path uses interupts.
- call the subsystem callback _after_ it was sent by hardware
- no need to copy our decouple the skb any more
- gives back control to the atm subsystem over the enqueued packages
- use an interupt for every sent atm package
Using interupts shouldn't be a problem because of the slow uplink bandwidth of
ADSL.
The speed _through_ the DSL router was always as high as it should
be, only traffic generated on the router itself were affected.
After changing to new tx path, the speed of iperf's run on the
router itself reached the same speed. The master/trunk wasn't as much
affected because of TCP optimisations (reboot-5022-gb2ea46fe236a).
The following results are taken on the remote server, which receives
the stream over the internet and the DSL line.
The sync moves between every sync a litte bit, but is so far stable
Latency / Interleave Delay: Down: Fast (0.25 ms) / Up: Fast (0.50
ms)
Data Rate:Down: 13.287 Mb/s / Up: 1.151 Mb/s
reboot-5521-g9f8d28285d without patch
[ ID] Interval Transfer Bandwidth Retr
[ 5] 0.00-10.04 sec 947 KBytes 773 Kbits/sec0 sender
[ 5] 0.00-10.04 sec 928 KBytes 757 Kbits/sec receiver
reboot-5521-g9f8d28285d with patch
[ 5] 0.00-10.06 sec 1.16 MBytes 970 Kbits/sec0 sender
[ 5] 0.00-10.06 sec 1.15 MBytes 959 Kbits/sec receiver
v17.01.4-239-g55c23e44f4 without patch
[ ID] Interval Transfer Bandwidth Retr
[ 5] 0.00-10.04 sec 87.4 KBytes 71.3 Kbits/sec0 sender
[ 5] 0.00-10.04 sec 59.6 KBytes 48.7 Kbits/sec receiver
v17.01.4-239-g55c23e44f4 with patch
[ ID] Interval Transfer Bandwidth Retr
[ 5] 0.00-10.05 sec 1.18 MBytes 983 Kbits/sec1 sender
[ 5] 0.00-10.05 sec 1.15 MBytes 959 Kbits/sec receiver
Signed-off-by: Alexander Couzens
---
.../kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h | 2 +
package/kernel/lantiq/ltq-atm/src/ltq_atm.c| 132 ++---
2 files changed, 88 insertions(+), 46 deletions(-)
diff --git a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h
b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h
index 2f754c982b2a..398be7d8282a 100644
--- a/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h
+++ b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h
@@ -43,6 +43,7 @@ struct ltq_atm_ops {
void (*fw_ver)(unsigned int *major, unsigned int *minor);
};
+#include
#include
/*
@@ -195,6 +196,7 @@ struct connection {
volatile struct tx_descriptor *tx_desc;
unsigned int tx_desc_pos;
struct sk_buff **tx_skb;
+ spinlock_t lock;
unsigned int aal5_vcc_crc_err; /* number of packets with CRC error */
unsigned int aal5_vcc_oversize_sdu; /* number of packets with oversize
error */
diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
index a08fa22ce24a..f306d19364fd 100644
--- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
+++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
@@ -19,6 +19,8 @@
** HISTORY
** $Date$Author $Comment
** 07 JUL 2009 Xu LiangInit Version
+**
+** Copyright 2017 Alexander Couzens
***/
#define IFX_ATM_VER_MAJOR 1
@@ -444,6 +446,9 @@ static int ppe_open(struct atm_vcc *vcc)
/* set htu entry */
set_htu_entry(vpi, vci, conn, vcc->qos.aal == ATM_AAL5 ? 1 : 0, 0);
+ *MBOX_IGU1_ISRC |= (1 << (conn + FIRST_QSB_QID + 16));
+ *MBOX_IGU1_IER |= (1 << (conn + FIRST_QSB_QID + 16));
+
ret = 0;
PPE_OPEN_EXIT:
@@ -511,14 +516,18 @@ static int ppe_send(struct atm_vcc *vcc, struct sk_buff
*skb)
int ret;
int conn;
int desc_base;
+ int byteoff;
+ int required;
+ /* the len of the data without offset an
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Tested-by: Koen Vandeputte Targets: cns3xxx, imx6 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Hi, Where in 4.9.75 does it avoid the page table isolation mitigation for AMD? Committed to the 4.14 and 4.15 branch is: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=694d99d40972f12e59a3696effee8a376b79d7c8 X86_BUG_CPU_INSECURE becomes X86_BUG_CPU_MELTDOWN via: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=de791821c295cc61419a06fe5562288417d1bc58 Regards, Nick On Mon, Jan 8, 2018 at 10:40 AM, Koen Vandeputte wrote: > Tested-by: Koen Vandeputte > > Targets: cns3xxx, imx6 > > > > ___ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
> On 8 Jan 2018, at 11:04, Nick Lowe wrote: > > Hi, > > Where in 4.9.75 does it avoid the page table isolation mitigation for AMD? > > Committed to the 4.14 and 4.15 branch is: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=694d99d40972f12e59a3696effee8a376b79d7c8 > > X86_BUG_CPU_INSECURE becomes X86_BUG_CPU_MELTDOWN via: > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=de791821c295cc61419a06fe5562288417d1bc58 > I guess Greg hasn’t yet put that into 4.9 stable queue. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Agreed. So this will seemingly regress something like an APU2 and therefore probably should not be merged to LEDE as-is? Nick On Mon, Jan 8, 2018 at 11:08 AM, Kevin Darbyshire-Bryant wrote: > > >> On 8 Jan 2018, at 11:04, Nick Lowe wrote: >> >> Hi, >> >> Where in 4.9.75 does it avoid the page table isolation mitigation for AMD? >> >> Committed to the 4.14 and 4.15 branch is: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=694d99d40972f12e59a3696effee8a376b79d7c8 >> >> X86_BUG_CPU_INSECURE becomes X86_BUG_CPU_MELTDOWN via: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=de791821c295cc61419a06fe5562288417d1bc58 >> > I guess Greg hasn’t yet put that into 4.9 stable queue. > ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Citeren Kevin Darbyshire-Bryant : On 8 Jan 2018, at 11:04, Nick Lowe wrote: Hi, Where in 4.9.75 does it avoid the page table isolation mitigation for AMD? Committed to the 4.14 and 4.15 branch is: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=694d99d40972f12e59a3696effee8a376b79d7c8 X86_BUG_CPU_INSECURE becomes X86_BUG_CPU_MELTDOWN via: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v4.15-rc7&id=de791821c295cc61419a06fe5562288417d1bc58 I guess Greg hasn’t yet put that into 4.9 stable queue. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/arch/x86/mm/kaiser.c?h=v4.9.75&id=8018307a45a90ab2eecfd03d48b7efb31707df37 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
> On 8 Jan 2018, at 11:12, Nick Lowe wrote: > > Agreed. So this will seemingly regress something like an APU2 and > therefore probably should not be merged to LEDE as-is? I’ll let an adult decide the performance/security tradeoff. signature.asc Description: Message signed with OpenPGP ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Hi Kevin, I am not following :-) For AMD, there should not be a tradeoff as there is no need for the page table isolation. Regards, Nick On Mon, Jan 8, 2018 at 11:21 AM, Kevin Darbyshire-Bryant wrote: > > >> On 8 Jan 2018, at 11:12, Nick Lowe wrote: >> >> Agreed. So this will seemingly regress something like an APU2 and >> therefore probably should not be merged to LEDE as-is? > > I’ll let an adult decide the performance/security tradeoff. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Hi all, I am a moron, I missed: +skip: + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + goto disable; It uses a different path... Regards, NIck On Mon, Jan 8, 2018 at 11:27 AM, Nick Lowe wrote: > Hi Kevin, > > I am not following :-) For AMD, there should not be a tradeoff as > there is no need for the page table isolation. > > Regards, > > Nick > > On Mon, Jan 8, 2018 at 11:21 AM, Kevin Darbyshire-Bryant > wrote: >> >> >>> On 8 Jan 2018, at 11:12, Nick Lowe wrote: >>> >>> Agreed. So this will seemingly regress something like an APU2 and >>> therefore probably should not be merged to LEDE as-is? >> >> I’ll let an adult decide the performance/security tradeoff. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
It looks like PCID and INVPCID support is likely to be back ported to the 4.9.76 Linux Kernel: https://patchwork.kernel.org/patch/10143225/ ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Sorry, it was back ported to 4.9.75 :-) On Mon, Jan 8, 2018 at 12:34 PM, Nick Lowe wrote: > It looks like PCID and INVPCID support is likely to be back ported to > the 4.9.76 Linux Kernel: https://patchwork.kernel.org/patch/10143225/ ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
AFAIK AMD processors that don't need that are from Zen onwards. Older ones are impacted. -Alberto On 08/01/2018 12:27, Nick Lowe wrote: Hi Kevin, I am not following :-) For AMD, there should not be a tradeoff as there is no need for the page table isolation. Regards, Nick On Mon, Jan 8, 2018 at 11:21 AM, Kevin Darbyshire-Bryant wrote: On 8 Jan 2018, at 11:12, Nick Lowe wrote: Agreed. So this will seemingly regress something like an APU2 and therefore probably should not be merged to LEDE as-is? I’ll let an adult decide the performance/security tradeoff. ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v1] kmod-sched-cake: bump to latest cake bake
More important bug fix: 402f05c Use full-rate mtu_time in all tins. Fixes an issue where some cake tins experienced excessive latency since 49776da (dynamically adjust target) Minor bug fixes: 31277c2 Avoid unsigned comparison against zero. Fix compiler warning, no known impact. 8cf5278 ack_filter: fix TCP flag check. A very contrived case may have lead to dropping a SYN packet that should not be dropped. Signed-off-by: Kevin Darbyshire-Bryant --- package/kernel/kmod-sched-cake/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/kmod-sched-cake/Makefile b/package/kernel/kmod-sched-cake/Makefile index ff27e95172..f9bcd65f13 100644 --- a/package/kernel/kmod-sched-cake/Makefile +++ b/package/kernel/kmod-sched-cake/Makefile @@ -13,9 +13,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git -PKG_SOURCE_DATE:=2017-12-22 -PKG_SOURCE_VERSION:=5bf0b6596721e18269ee4bae6e3549c75cba923a -PKG_MIRROR_HASH:=95c0f886a3ad8ccfd7b35fa19af8b5ecbf0b2f74caea73fbabd6574f1c3be2db +PKG_SOURCE_DATE:=2018-01-07 +PKG_SOURCE_VERSION:=568ed96467f41aad37556b0db11fc008e05941e9 +PKG_MIRROR_HASH:=8f3f962824826d07b1029379d91e01bf97fe0bfce1233af5cfa7a54cb1c3632c include $(INCLUDE_DIR)/package.mk -- 2.14.3 (Apple Git-98) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH v1] kmod-sched-cake: bump to latest cake bake for 17.01
More important bug fix: 402f05c Use full-rate mtu_time in all tins. Fixes an issue where some cake tins experienced excessive latency since 49776da (dynamically adjust target) Minor bug fixes: 31277c2 Avoid unsigned comparison against zero. Fix compiler warning, no known impact. 8cf5278 ack_filter: fix TCP flag check. A very contrived case may have lead to dropping a SYN packet that should not be dropped. Signed-off-by: Kevin Darbyshire-Bryant --- package/kernel/kmod-sched-cake/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/kmod-sched-cake/Makefile b/package/kernel/kmod-sched-cake/Makefile index bd62e64f6f..25945db301 100644 --- a/package/kernel/kmod-sched-cake/Makefile +++ b/package/kernel/kmod-sched-cake/Makefile @@ -13,9 +13,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git -PKG_SOURCE_DATE:=2017-12-22 -PKG_SOURCE_VERSION:=5bf0b6596721e18269ee4bae6e3549c75cba923a -PKG_MIRROR_HASH:=95c0f886a3ad8ccfd7b35fa19af8b5ecbf0b2f74caea73fbabd6574f1c3be2db +PKG_SOURCE_DATE:=2018-01-07 +PKG_SOURCE_VERSION:=568ed96467f41aad37556b0db11fc008e05941e9 +PKG_MIRROR_HASH:=8f3f962824826d07b1029379d91e01bf97fe0bfce1233af5cfa7a54cb1c3632c include $(INCLUDE_DIR)/package.mk -- 2.14.3 (Apple Git-98) ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Alberto, Despite the disinformation Intel initially spread, it looks like AMD processors are not vulnerable to Meltdown (which these patches should address). Spectre is a different thing altogether, and affects AMD and Intel as well, but these are other CVEs. Stijn ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 08/15] metadata: remove redundant fields from package hash
Signed-off-by: Matthias Schiffer
---
scripts/metadata.pm | 3 ---
scripts/package-metadata.pl | 8
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index e636a45a33..50f91407d6 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -224,9 +224,7 @@ sub parse_package_metadata($) {
/^Package:\s*(.+?)\s*$/ and do {
undef $feature;
$pkg = {};
- $pkg->{ignore} = $src->{ignore};
$pkg->{src} = $src;
- $pkg->{makefile} = $src->{makefile};
$pkg->{name} = $1;
$pkg->{title} = "";
$pkg->{depends} = [];
@@ -273,7 +271,6 @@ sub parse_package_metadata($) {
name => $vpkg,
vdepends => [],
src => $src,
- makefile => $src->{makefile},
};
push @{$package{$vpkg}->{vdepends}},
$pkg->{name};
}
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index c98db46d36..233fb0eabf 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -290,7 +290,7 @@ sub print_package_config_category($) {
print "menu \"$menu\"\n";
}
foreach my $pkg (@pkgs) {
- next if $pkg->{ignore};
+ next if $pkg->{src}->{ignore};
my $title = $pkg->{name};
my $c = (72 - length($pkg->{name}) -
length($pkg->{title}));
if ($c > 0) {
@@ -485,7 +485,7 @@ sub gen_package_mk() {
if (defined($pkg_dep) &&
defined($pkg_dep->{src})) {
unless (!$deptype || grep { $_ eq
$deptype } @{$pkg_dep->{src}->{buildtypes}}) {
warn sprintf "WARNING: Makefile
'%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s'
build type\n",
- $src->{makefile},
$type, $pkg_dep->{src}->{name}, $deptype, $pkg_dep->{makefile}, $deptype;
+ $src->{makefile},
$type, $pkg_dep->{src}->{name}, $deptype, $pkg_dep->{src}->{makefile}, $deptype;
next;
}
$idx = $pkg_dep->{src}->{path};
@@ -539,7 +539,7 @@ sub gen_package_mk() {
if (defined $pkg_dep->{src}) {
unless (!$deptype || grep { $_ eq
$deptype } @{$pkg_dep->{src}->{buildtypes}}) {
warn sprintf "WARNING: Makefile
'%s' has a build dependency on '%s/%s' but '%s' does not implement a '%s' build
type\n",
- $src->{makefile},
$pkg_dep->{src}->{name}, $deptype, $pkg_dep->{makefile}, $deptype;
+ $src->{makefile},
$pkg_dep->{src}->{name}, $deptype, $pkg_dep->{src}->{makefile}, $deptype;
next;
}
$idx = $pkg_dep->{src}->{path};
@@ -640,7 +640,7 @@ sub gen_package_license($) {
} else {
if ($level == 1) {
print "$pkg->{name}: Missing license! ";
- print "Please fix $pkg->{makefile}\n";
+ print "Please fix
$pkg->{src}->{makefile}\n";
}
}
}
--
2.15.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 07/15] metadata: replace %subdir hash with a path field in source packages
Every single reference to subdir was concatenated with the source package
name, so it makes sense to store the concatenated value instead.
Signed-off-by: Matthias Schiffer
---
scripts/metadata.pm | 12 +++-
scripts/package-metadata.pl | 25 -
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 0577390eda..e636a45a33 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -2,13 +2,12 @@ package metadata;
use base 'Exporter';
use strict;
use warnings;
-our @EXPORT = qw(%package %srcpackage %category %subdir %preconfig %features
%overrides clear_packages parse_package_metadata parse_target_metadata
get_multiline @ignore %usernames %groupnames);
+our @EXPORT = qw(%package %srcpackage %category %preconfig %features
%overrides clear_packages parse_package_metadata parse_target_metadata
get_multiline @ignore %usernames %groupnames);
our %package;
our %preconfig;
our %srcpackage;
our %category;
-our %subdir;
our %features;
our %overrides;
our @ignore;
@@ -178,7 +177,6 @@ sub parse_target_metadata($) {
}
sub clear_packages() {
- %subdir = ();
%preconfig = ();
%package = ();
%srcpackage = ();
@@ -204,12 +202,10 @@ sub parse_package_metadata($) {
};
while () {
chomp;
- /^Source-Makefile:
\s*(package\/((?:.+\/)?)([^\/]+)\/Makefile)\s*$/ and do {
- $subdir{$3} = $2;
-
+ /^Source-Makefile:
\s*(package\/((?:.+\/)?([^\/]+))\/Makefile)\s*$/ and do {
$src = {
makefile => $1,
- subdir => $2,
+ path => $2,
name => $3,
ignore => $ignore{$3},
packages => [],
@@ -235,7 +231,6 @@ sub parse_package_metadata($) {
$pkg->{title} = "";
$pkg->{depends} = [];
$pkg->{mdepends} = [];
- $pkg->{subdir} = $src->{subdir};
$pkg->{tristate} = 1;
$pkg->{override} = $override;
$package{$1} = $pkg;
@@ -278,7 +273,6 @@ sub parse_package_metadata($) {
name => $vpkg,
vdepends => [],
src => $src,
- subdir => $src->{subdir},
makefile => $src->{makefile},
};
push @{$package{$vpkg}->{vdepends}},
$pkg->{name};
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 2369c37e2b..c98db46d36 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -419,7 +419,6 @@ sub gen_package_mk() {
parse_package_metadata($ARGV[0]) or exit 1;
foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
my $src = $srcpackage{$srcname};
- my $path = $subdir{$srcname}.$srcname;
my $variant_default;
my @srcdeps;
@@ -429,30 +428,30 @@ sub gen_package_mk() {
my $config = '';
$config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless
$pkg->{buildonly};
- $pkg->{prereq} and print "prereq-$config += $path\n";
+ $pkg->{prereq} and print "prereq-$config +=
$src->{path}\n";
next if $pkg->{buildonly};
- print "package-$config += $path\n";
+ print "package-$config += $src->{path}\n";
if ($pkg->{variant}) {
if (!defined($variant_default) or
$pkg->{variant_default}) {
$variant_default = $pkg->{variant};
}
- print "\$(curdir)/$path/variants += \$(if
$config,$pkg->{variant})\n";
+ print "\$(curdir)/$src->{path}/variants +=
\$(if $config,$pkg->{variant})\n";
}
}
if (defined($variant_default)) {
- print "\$(curdir)/$path/default-variant :=
$variant_default\n";
+ print "\$(curdir)/$src->{path}/default-variant :=
$variant_default\n";
}
unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
- print "package- += $path\n";
+ print "package- += $src->{path}\n";
}
if (@{$src->{buildtypes}} > 0) {
- print "buildtypes-$path = ".join(' ',
@{$src->{buildtypes}})."\n";
+ print "buildtypes-$src->{path} = ".joi
[LEDE-DEV] [PATCH 03/15] metadata: move 'buildtypes' from binary to source packages
Build types are a property of source rather than binary packages. This is a
preparation for followup cleanup.
Signed-off-by: Matthias Schiffer
---
scripts/metadata.pm | 4 ++--
scripts/package-metadata.pl | 13 +++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 297abc9f12..985e6237a6 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -214,6 +214,7 @@ sub parse_package_metadata($) {
$subdir{$src} = $subdir;
$srcpackage{$src} = {
packages => [],
+ buildtypes => [],
};
$override = "";
undef $pkg;
@@ -234,7 +235,6 @@ sub parse_package_metadata($) {
$pkg->{depends} = [];
$pkg->{mdepends} = [];
$pkg->{builddepends} = [];
- $pkg->{buildtypes} = [];
$pkg->{subdir} = $subdir;
$pkg->{tristate} = 1;
$pkg->{override} = $override;
@@ -258,6 +258,7 @@ sub parse_package_metadata($) {
/^Feature-Description:/ and $feature->{description} =
get_multiline(\*FILE, "\t\t\t");
next;
};
+ /^Build-Types:\s*(.+)\s*$/ and $srcpackage{$src}->{buildtypes}
= [ split /\s+/, $1 ];
next unless $pkg;
/^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
/^Title: \s*(.+)\s*$/ and $pkg->{title} = $1;
@@ -290,7 +291,6 @@ sub parse_package_metadata($) {
/^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
/^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [
split /\s+/, $1 ];
/^Build-Depends\/(\w+): \s*(.+)\s*$/ and
$pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];
- /^Build-Types:\s*(.+)\s*$/ and $pkg->{buildtypes} = [ split
/\s+/, $1 ];
/^Repository:\s*(.+?)\s*$/ and $pkg->{repository} = $1;
/^Category: \s*(.+)\s*$/ and do {
$pkg->{category} = $1;
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 3a176c8024..08c2343ade 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -421,6 +421,7 @@ sub gen_package_mk() {
foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
my $config;
my $pkg = $package{$name};
+ my $src = $srcpackage{$pkg->{src}};
my @srcdeps;
next if defined $pkg->{vdepends};
@@ -441,11 +442,11 @@ sub gen_package_mk() {
next if $done{$pkg->{src}};
$done{$pkg->{src}} = 1;
- if (@{$pkg->{buildtypes}} > 0) {
- print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join('
', @{$pkg->{buildtypes}})."\n";
+ if (@{$src->{buildtypes}} > 0) {
+ print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join('
', @{$src->{buildtypes}})."\n";
}
- foreach my $spkg (@{$srcpackage{$pkg->{src}}->{packages}}) {
+ foreach my $spkg (@{$src->{packages}}) {
foreach my $dep (@{$spkg->{depends}},
@{$spkg->{builddepends}}) {
$dep =~ /@/ or do {
$dep =~ s/\+//g;
@@ -453,7 +454,7 @@ sub gen_package_mk() {
};
}
}
- foreach my $type (@{$pkg->{buildtypes}}) {
+ foreach my $type (@{$src->{buildtypes}}) {
my @extra_deps;
my %deplines;
@@ -476,7 +477,7 @@ sub gen_package_mk() {
my $idx = "";
my $pkg_dep = $package{$dep};
if (defined($pkg_dep) &&
defined($pkg_dep->{src})) {
- unless (!$deptype || grep { $_ eq
$deptype } @{$pkg_dep->{buildtypes}}) {
+ unless (!$deptype || grep { $_ eq
$deptype } @{$srcpackage{$pkg_dep->{src}}->{buildtypes}}) {
warn sprintf "WARNING: Makefile
'%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s'
build type\n",
$pkg->{makefile},
$type, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
next;
@@ -530,7 +531,7 @@ sub gen_package_mk() {
foreach my $dep (@deps) {
$pkg_dep = $package{$deps};
if (defined $pkg_dep->{src}) {
- unless (!$deptype || grep { $_ eq
$
[LEDE-DEV] [PATCH 06/15] metadata: change pkg->{src} field to hold a reference
We often want to access fields of a source packages through pkg->{src}.
Allow accessing them directly instead of resolving the source hash through
srcpackages.
Signed-off-by: Matthias Schiffer
---
scripts/feeds | 4 ++--
scripts/metadata.pm | 51 ++---
scripts/package-metadata.pl | 14 ++---
3 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/scripts/feeds b/scripts/feeds
index 31481edcb1..b531fbac62 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -494,7 +494,7 @@ sub install_package {
warn "WARNING: Package '$name' is not available in feed
$feed->[1].\n";
return 0;
};
- my $src = $pkg->{src};
+ my $src = $pkg->{src}->{name};
my $type = $feed->[0];
$src or $src = $name;
@@ -663,7 +663,7 @@ sub uninstall {
warn "WARNING: $name not installed\n";
next;
};
- $pkg->{src} and $name = $pkg->{src};
+ $pkg->{src} and $name = $pkg->{src}->{name};
warn "Uninstalling package '$name'\n";
system("rm -f ./package/feeds/*/$name");
$uninstall = 1;
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 404309dc4e..0577390eda 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -193,9 +193,7 @@ sub parse_package_metadata($) {
my $file = shift;
my $pkg;
my $feature;
- my $makefile;
my $preconfig;
- my $subdir;
my $src;
my $override;
my %ignore = map { $_ => 1 } @ignore;
@@ -206,41 +204,42 @@ sub parse_package_metadata($) {
};
while () {
chomp;
- /^Source-Makefile: \s*((.+\/)([^\/]+)\/Makefile)\s*$/ and do {
- $makefile = $1;
- $subdir = $2;
- $src = $3;
- $subdir =~ s/^package\///;
- $subdir{$src} = $subdir;
- $srcpackage{$src} = {
- makefile => $makefile,
+ /^Source-Makefile:
\s*(package\/((?:.+\/)?)([^\/]+)\/Makefile)\s*$/ and do {
+ $subdir{$3} = $2;
+
+ $src = {
+ makefile => $1,
+ subdir => $2,
+ name => $3,
+ ignore => $ignore{$3},
packages => [],
buildtypes => [],
builddepends => [],
};
+ $srcpackage{$3} = $src;
$override = "";
undef $pkg;
};
/^Override: \s*(.+?)\s*$/ and do {
$override = $1;
- $overrides{$src} = 1;
+ $overrides{$src->{name}} = 1;
};
next unless $src;
/^Package:\s*(.+?)\s*$/ and do {
undef $feature;
$pkg = {};
- $pkg->{ignore} = $ignore{$src};
+ $pkg->{ignore} = $src->{ignore};
$pkg->{src} = $src;
- $pkg->{makefile} = $makefile;
+ $pkg->{makefile} = $src->{makefile};
$pkg->{name} = $1;
$pkg->{title} = "";
$pkg->{depends} = [];
$pkg->{mdepends} = [];
- $pkg->{subdir} = $subdir;
+ $pkg->{subdir} = $src->{subdir};
$pkg->{tristate} = 1;
$pkg->{override} = $override;
$package{$1} = $pkg;
- push @{$srcpackage{$src}->{packages}}, $pkg;
+ push @{$src->{packages}}, $pkg;
};
/^Feature:\s*(.+?)\s*$/ and do {
undef $pkg;
@@ -251,7 +250,7 @@ sub parse_package_metadata($) {
$feature and do {
/^Target-Name:\s*(.+?)\s*$/ and do {
$features{$1} or $features{$1} = [];
- push @{$features{$1}}, $feature unless
$ignore{$src};
+ push @{$features{$1}}, $feature unless
$src->{ignore};
};
/^Target-Title:\s*(.+?)\s*$/ and
$feature->{target_title} = $1;
/^Feature-Priority:\s*(\d+)\s*$/ and
$feature->{priority} = $1;
@@ -259,9 +258,9 @@ sub parse_package_metadata($) {
/^Feature-Description:/ and $feature->{description} =
get_multiline(\*FILE, "\t\t\t");
next;
[LEDE-DEV] [PATCH 05/15] metadata: interate over source packages when generating Makefile
All build dependencies are between source packages. Interating over source
rather than binary packages simplifies parts of the code and prepares
further improvement.
As a side effect, this changes the implicit default variant of a few
packages (the first defined is used now instead of the lexicographically
first).
Signed-off-by: Matthias Schiffer
---
scripts/metadata.pm | 1 +
scripts/package-metadata.pl | 61 ++---
2 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index c150b547f1..404309dc4e 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -213,6 +213,7 @@ sub parse_package_metadata($) {
$subdir =~ s/^package\///;
$subdir{$src} = $subdir;
$srcpackage{$src} = {
+ makefile => $makefile,
packages => [],
buildtypes => [],
builddepends => [],
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index a6cff40696..077956e6a1 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -414,36 +414,45 @@ sub get_conditional_dep($$) {
sub gen_package_mk() {
my %conf;
my %dep;
- my %done;
my $line;
parse_package_metadata($ARGV[0]) or exit 1;
- foreach my $name (sort {uc($a) cmp uc($b)} keys %package) {
- my $config;
- my $pkg = $package{$name};
- my $src = $srcpackage{$pkg->{src}};
+ foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
+ my $src = $srcpackage{$srcname};
+ my $path = $subdir{$srcname}.$srcname;
+ my $variant_default;
my @srcdeps;
- next if defined $pkg->{vdepends};
+ foreach my $pkg (@{$src->{packages}}) {
+ next if defined $pkg->{vdepends};
+
+ my $config = '';
+ $config = "\$(CONFIG_PACKAGE_$pkg->{name})" unless
$pkg->{buildonly};
+
+ $pkg->{prereq} and print "prereq-$config += $path\n";
+
+ next if $pkg->{buildonly};
+
+ print "package-$config += $path\n";
- $config = "\$(CONFIG_PACKAGE_$name)";
- if ($config) {
- $pkg->{buildonly} and $config = "";
- print "package-$config += $pkg->{subdir}$pkg->{src}\n";
if ($pkg->{variant}) {
- if (!defined($done{$pkg->{src}}) or
$pkg->{variant_default}) {
- print
"\$(curdir)/$pkg->{subdir}$pkg->{src}/default-variant := $pkg->{variant}\n";
+ if (!defined($variant_default) or
$pkg->{variant_default}) {
+ $variant_default = $pkg->{variant};
}
- print
"\$(curdir)/$pkg->{subdir}$pkg->{src}/variants += \$(if
$config,$pkg->{variant})\n"
+ print "\$(curdir)/$path/variants += \$(if
$config,$pkg->{variant})\n";
}
- $pkg->{prereq} and print "prereq-$config +=
$pkg->{subdir}$pkg->{src}\n";
}
- next if $done{$pkg->{src}};
- $done{$pkg->{src}} = 1;
+ if (defined($variant_default)) {
+ print "\$(curdir)/$path/default-variant :=
$variant_default\n";
+ }
+
+ unless (grep {!$_->{buildonly}} @{$src->{packages}}) {
+ print "package- += $path\n";
+ }
if (@{$src->{buildtypes}} > 0) {
- print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join('
', @{$src->{buildtypes}})."\n";
+ print "buildtypes-$path = ".join(' ',
@{$src->{buildtypes}})."\n";
}
foreach my $dep (@{$src->{builddepends}}, map {
@{$_->{depends}} } @{$src->{packages}}) {
@@ -477,7 +486,7 @@ sub gen_package_mk() {
if (defined($pkg_dep) &&
defined($pkg_dep->{src})) {
unless (!$deptype || grep { $_ eq
$deptype } @{$srcpackage{$pkg_dep->{src}}->{buildtypes}}) {
warn sprintf "WARNING: Makefile
'%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s'
build type\n",
- $pkg->{makefile},
$type, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
+ $src->{makefile},
$type, $pkg_dep->{src}, $deptype, $pkg_dep->{makefile}, $deptype;
next;
[LEDE-DEV] [PATCH 01/15] metadata: remove 'base-files' special case
Nothing explicitly depends on base-files, and even if it would, it would
not cause any problems. Remove the unused special case.
Signed-off-by: Matthias Schiffer
---
scripts/package-metadata.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index fbd458bf2a..46446e994b 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -539,7 +539,7 @@ sub gen_package_mk() {
} elsif (defined($srcpackage{$dep})) {
$idx = $subdir{$dep}.$dep;
}
- undef $idx if $idx eq 'base-files';
+
if ($idx) {
$idx .= $suffix;
--
2.15.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 15/15] include/package-dumpinfo.mk: don't duplicate source package information for every binary package
Eventually the BUILDONLY package flag could be replaced by simply creating a package Makefile without any BuildPackage calls. This will fail for now, as BuildPackage also causes the Makefile's compile target etc. to do something useful at all. Signed-off-by: Matthias Schiffer --- include/package-dumpinfo.mk | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk index 68a66d0769..8a42be5bd1 100644 --- a/include/package-dumpinfo.mk +++ b/include/package-dumpinfo.mk @@ -7,10 +7,17 @@ ifneq ($(DUMP),) -dumpinfo: FORCE + +define SOURCE_INFO +$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS) +)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS) +)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES) +) + +endef define Dumpinfo/Package -$(info Package: $(1) +$(info $(SOURCE_INFO)Package: $(1) $(if $(MENU),Menu: $(MENU) )$(if $(SUBMENU),Submenu: $(SUBMENU) )$(if $(SUBMENUDEP),Submenu-Depends: $(SUBMENUDEP) @@ -23,10 +30,7 @@ Menu-Depends: $(MDEPENDS) Provides: $(PROVIDES) $(if $(VARIANT),Build-Variant: $(VARIANT) $(if $(DEFAULT_VARIANT),Default-Variant: $(VARIANT) -))$(if $(PKG_BUILD_DEPENDS),Build-Depends: $(PKG_BUILD_DEPENDS) -)$(if $(HOST_BUILD_DEPENDS),Build-Depends/host: $(HOST_BUILD_DEPENDS) -)$(if $(BUILD_TYPES),Build-Types: $(BUILD_TYPES) -)Section: $(SECTION) +))Section: $(SECTION) Category: $(CATEGORY) $(if $(filter nonshared,$(PKGFLAGS)),,Repository: $(if $(FEED),$(FEED),base) )Title: $(TITLE) @@ -47,6 +51,10 @@ $(if $(Package/$(1)/config),Config: $(Package/$(1)/config) @@ )) +SOURCE_INFO := endef +dumpinfo: FORCE + $(if $(SOURCE_INFO),$(info $(SOURCE_INFO))) + endif -- 2.15.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 00/15] Metadata generator refactoring, cleanup and PROVIDES improvements
When attempting to fix FS#837, I decided to treat our metadata generator to
a greater refactoring, which resulted in this patchset. FS#837 is fixed in
patch 13.
I also removed two seemingly obsolete features, "preconfig" and "package
features", which are not used by any package in the OpenWrt/LEDE base or
our default feeds.
The changes in this patchset also improve dependency diagnostics and
clearly separate between build depends (on source packages) and runtime
depends (on binary packages, implying build depends). This requires some
fixes in package Makefiles with broken dependencies (patch 10, [1], [2]).
There are also broken runtime depends in many feed packages, which I did
not fix, but which will be shown more prominently during prepare-tmpinfo
now. I'm not sure what the best way to handle such broken dependencies is,
as they might also be caused by missing feeds, e.g. LuCI depending on
telephony packages.
- Keep the warning, but try to build the packages as before (current
solution in this patchset)?
- Hide the warning again (old state)?
- Ignore packages with missing build dependencies altogether (just show a
warning in the metadata generators)?
As hinted in patch 15, I have further refactoring in mind, but let's try to
get this set reviewed and committed first...
Regards,
Matthias
[1] https://github.com/openwrt/packages/pull/5370
[2] https://github.com/openwrt-routing/packages/pull/345
Matthias Schiffer (15):
metadata: remove 'base-files' special case
metadata: make srcpackage extensible
metadata: move 'buildtypes' from binary to source packages
metadata: move 'builddepends' from binary to source packages
metadata: interate over source packages when generating Makefile
metadata: change pkg->{src} field to hold a reference
metadata: replace %subdir hash with a path field in source packages
metadata: remove redundant fields from package hash
build: remove package preconfig feature
treewide: fix build depends to refer to source package names
metadata: handle target build depends together with host build depends
metadata: simplify generation of build depends from runtime depends
metadata: always resolve dependencies through provides list
build: remove obsolete "package feature" feature
include/package-dumpinfo.mk: don't duplicate source package
information for every binary package
include/autotools.mk | 4 +-
include/nls.mk | 2 +-
include/package-dumpinfo.mk | 53 +
package/Makefile | 3 -
package/network/config/ltq-adsl-app/Makefile | 2 +-
package/network/config/ltq-vdsl-app/Makefile | 2 +-
scripts/feeds| 28 +--
scripts/metadata.pm | 101 +++--
scripts/package-metadata.pl | 299 +--
9 files changed, 158 insertions(+), 336 deletions(-)
--
2.15.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 02/15] metadata: make srcpackage extensible
Turn the srcpackage values into hashes to allow storing more information
than just binary package names.
Signed-off-by: Matthias Schiffer
---
scripts/feeds | 2 +-
scripts/metadata.pm | 6 --
scripts/package-metadata.pl | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/scripts/feeds b/scripts/feeds
index 55c294ad0a..42f7b3b116 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -525,7 +525,7 @@ sub install_package {
};
# install all dependencies referenced from the source package
- foreach my $vpkg (@{$feed_src->{$src}}) {
+ foreach my $vpkg (@{$feed_src->{$src}->{packages}}) {
foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}},
@{$vpkg->{"builddepends/host"}}) {
next if $dep =~ /@/;
$dep =~ s/^\+//;
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index d446892e2b..297abc9f12 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -212,7 +212,9 @@ sub parse_package_metadata($) {
$src = $3;
$subdir =~ s/^package\///;
$subdir{$src} = $subdir;
- $srcpackage{$src} = [];
+ $srcpackage{$src} = {
+ packages => [],
+ };
$override = "";
undef $pkg;
};
@@ -237,7 +239,7 @@ sub parse_package_metadata($) {
$pkg->{tristate} = 1;
$pkg->{override} = $override;
$package{$1} = $pkg;
- push @{$srcpackage{$src}}, $pkg;
+ push @{$srcpackage{$src}->{packages}}, $pkg;
};
/^Feature:\s*(.+?)\s*$/ and do {
undef $pkg;
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 46446e994b..3a176c8024 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -445,7 +445,7 @@ sub gen_package_mk() {
print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join('
', @{$pkg->{buildtypes}})."\n";
}
- foreach my $spkg (@{$srcpackage{$pkg->{src}}}) {
+ foreach my $spkg (@{$srcpackage{$pkg->{src}}->{packages}}) {
foreach my $dep (@{$spkg->{depends}},
@{$spkg->{builddepends}}) {
$dep =~ /@/ or do {
$dep =~ s/\+//g;
--
2.15.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 10/15] treewide: fix build depends to refer to source package names
Build depends must refer to source packages rather than binary package names. Signed-off-by: Matthias Schiffer --- include/autotools.mk | 4 ++-- include/nls.mk | 2 +- package/network/config/ltq-adsl-app/Makefile | 2 +- package/network/config/ltq-vdsl-app/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/autotools.mk b/include/autotools.mk index 7bd400ab36..aa044aa0b4 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -105,14 +105,14 @@ ifneq ($(filter patch-libtool,$(PKG_FIXUP)),) endif ifneq ($(filter libtool,$(PKG_FIXUP)),) - PKG_BUILD_DEPENDS += libtool libintl libiconv + PKG_BUILD_DEPENDS += libtool gettext libiconv ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) Hooks/Configure/Pre += autoreconf_target endif endif ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),) - PKG_BUILD_DEPENDS += libtool libintl libiconv + PKG_BUILD_DEPENDS += libtool gettext libiconv ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) Hooks/Configure/Pre += autoreconf_target endif diff --git a/include/nls.mk b/include/nls.mk index 51463b9f12..04838821b4 100644 --- a/include/nls.mk +++ b/include/nls.mk @@ -23,7 +23,7 @@ else endif PKG_CONFIG_DEPENDS += CONFIG_BUILD_NLS -PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv !BUILD_NLS:libintl +PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv !BUILD_NLS:gettext ICONV_DEPENDS:=+BUILD_NLS:libiconv-full ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile index cf8eaf247d..153cf9a26c 100644 --- a/package/network/config/ltq-adsl-app/Makefile +++ b/package/network/config/ltq-adsl-app/Makefile @@ -24,7 +24,7 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_LTQ_DSL_ENABLE_SOAP \ CONFIG_LTQ_DSL_ENABLE_DSL_EVENT_POLLING -PKG_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-adsl-danube TARGET_lantiq_xway_legacy:kmod-ltq-adsl-danube TARGET_lantiq_ase:kmod-ltq-adsl-ase +PKG_BUILD_DEPENDS:=ltq-adsl PKG_FLAGS:=nonshared diff --git a/package/network/config/ltq-vdsl-app/Makefile b/package/network/config/ltq-vdsl-app/Makefile index baf63f9d13..71842ce345 100644 --- a/package/network/config/ltq-vdsl-app/Makefile +++ b/package/network/config/ltq-vdsl-app/Makefile @@ -17,7 +17,7 @@ PKG_HASH:=da8bb929526a61aea0e153ef524331fcd472a1ebbc6d88ca017735a4f82ece02 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BASE_NAME)-$(PKG_VERSION) PKG_LICENSE:=BSD-2-Clause -PKG_BUILD_DEPENDS:=kmod-ltq-vdsl-vr9 +PKG_BUILD_DEPENDS:=ltq-vdsl PKG_FLAGS:=nonshared -- 2.15.1 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 12/15] metadata: simplify generation of build depends from runtime depends
Runtime depends cannot have a buildtype suffix, and they never refer to
source package names. In addition, this adds warnings about unsatisfiable
dependencies.
Furthermore, this change fixes the generation of conditional build
dependencies for virtual packages provided by different source packages.
Signed-off-by: Matthias Schiffer
---
scripts/package-metadata.pl | 112
1 file changed, 41 insertions(+), 71 deletions(-)
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index e492cc8a09..980ad24dc0 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -399,18 +399,56 @@ sub get_conditional_dep($$) {
}
sub gen_package_mk() {
- my %conf;
- my %dep;
my $line;
parse_package_metadata($ARGV[0]) or exit 1;
foreach my $srcname (sort {uc($a) cmp uc($b)} keys %srcpackage) {
my $src = $srcpackage{$srcname};
my $variant_default;
- my @srcdeps;
my %deplines = ('' => {});
foreach my $pkg (@{$src->{packages}}) {
+ foreach my $dep (@{$pkg->{depends}}) {
+ next if ($dep =~ /@/);
+
+ my $condition;
+
+ $dep =~ s/\+//g;
+ if ($dep =~ /^(.+):(.+)/) {
+ $condition = $1;
+ $dep = $2;
+ }
+
+ my $pkg_dep = $package{$dep};
+ unless (defined $pkg_dep) {
+ warn sprintf "WARNING: Makefile '%s'
has a dependency on '%s', which does not exist\n",
+ $src->{makefile}, $dep;
+ next;
+ }
+
+ unless ($pkg_dep->{vdepends}) {
+ next if $srcname eq
$pkg_dep->{src}->{name};
+
+ my $depstr =
"\$(curdir)/$pkg_dep->{src}->{path}/compile";
+ my $depline =
get_conditional_dep($condition, $depstr);
+ if ($depline) {
+ $deplines{''}->{$depline}++;
+ }
+ next;
+ }
+
+ foreach my $vdep (@{$pkg_dep->{vdepends}}) {
+ my $pkg_vdep = $package{$vdep};
+ next if $srcname eq
$pkg_vdep->{src}->{name};
+
+ my $depstr = "\$(if
\$(CONFIG_PACKAGE_$vdep),\$(curdir)/$pkg_vdep->{src}->{path}/compile)";
+ my $depline =
get_conditional_dep($condition, $depstr);
+ if ($depline) {
+ $deplines{''}->{$depline}++;
+ }
+ }
+ }
+
next if defined $pkg->{vdepends};
my $config = '';
@@ -442,12 +480,6 @@ sub gen_package_mk() {
print "buildtypes-$src->{path} = ".join(' ',
@{$src->{buildtypes}})."\n";
}
- foreach my $dep (map { @{$_->{depends}} } @{$src->{packages}}) {
- $dep =~ /@/ or do {
- $dep =~ s/\+//g;
- push @srcdeps, $dep;
- };
- }
foreach my $type ('', @{$src->{buildtypes}}) {
my $suffix = '';
@@ -489,68 +521,6 @@ sub gen_package_mk() {
}
}
- foreach my $deps (@srcdeps) {
- my $idx;
- my $condition;
- my $prefix = "";
- my $suffix = "";
- my $deptype = "";
-
- if ($deps =~ /^(.+):(.+)/) {
- $condition = $1;
- $deps = $2;
- }
- if ($deps =~ /^(.+)\/(.+)/) {
- $deps = $1;
- $deptype = $2;
- $suffix = "/$2";
- }
-
- my $pkg_dep = $package{$deps};
- my @deps;
-
- if ($pkg_dep->{vdepends}) {
- @deps = @{$pkg_dep->{vdepends}};
- } else {
- @deps = ($deps);
- }
-
- foreach my $dep (@deps)
[LEDE-DEV] [PATCH 11/15] metadata: handle target build depends together with host build depends
Target build depends are similar to host build depends in that they refer
to source packages rather than binary packages. Therefore, it makes sense
to handle them together, rather than putting them in a list together with
runtime depends and trying to figure out if the entries refer to source or
to binary packages afterwards.
This does lead to PKG_BUILD_DEPENDS entries referring to binary package
names not working anymore, which requires some fixes in the package
repositories.
Signed-off-by: Matthias Schiffer
---
scripts/package-metadata.pl | 60 +
1 file changed, 28 insertions(+), 32 deletions(-)
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 9372191166..e492cc8a09 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -408,6 +408,7 @@ sub gen_package_mk() {
my $src = $srcpackage{$srcname};
my $variant_default;
my @srcdeps;
+ my %deplines = ('' => {});
foreach my $pkg (@{$src->{packages}}) {
next if defined $pkg->{vdepends};
@@ -441,19 +442,23 @@ sub gen_package_mk() {
print "buildtypes-$src->{path} = ".join(' ',
@{$src->{buildtypes}})."\n";
}
- foreach my $dep (@{$src->{builddepends}}, map {
@{$_->{depends}} } @{$src->{packages}}) {
+ foreach my $dep (map { @{$_->{depends}} } @{$src->{packages}}) {
$dep =~ /@/ or do {
$dep =~ s/\+//g;
push @srcdeps, $dep;
};
}
- foreach my $type (@{$src->{buildtypes}}) {
- my @extra_deps;
- my %deplines;
+ foreach my $type ('', @{$src->{buildtypes}}) {
+ my $suffix = '';
- next unless $src->{"builddepends/$type"};
- foreach my $dep (@{$src->{"builddepends/$type"}}) {
- my $suffix = "";
+ $suffix = "/$type" if $type;
+
+ next unless $src->{"builddepends$suffix"};
+
+ defined $deplines{$suffix} or $deplines{$suffix} = {};
+
+ foreach my $dep (@{$src->{"builddepends$suffix"}}) {
+ my $depsuffix = "";
my $deptype = "";
my $condition;
@@ -464,37 +469,26 @@ sub gen_package_mk() {
if ($dep =~ /^(.+)\/(.+)/) {
$dep = $1;
$deptype = $2;
- $suffix = "/$2";
+ $depsuffix = "/$2";
}
- my $idx = "";
- my $pkg_dep = $package{$dep};
- if (defined($pkg_dep) &&
defined($pkg_dep->{src})) {
- unless (!$deptype || grep { $_ eq
$deptype } @{$pkg_dep->{src}->{buildtypes}}) {
- warn sprintf "WARNING: Makefile
'%s' has a %s build dependency on '%s/%s' but '%s' does not implement a '%s'
build type\n",
- $src->{makefile},
$type, $pkg_dep->{src}->{name}, $deptype, $pkg_dep->{src}->{makefile}, $deptype;
- next;
- }
- $idx = $pkg_dep->{src}->{path};
- } elsif (defined($srcpackage{$dep})) {
- $idx = $srcpackage{$dep}->{path};
- } else {
+ next if $srcname.$suffix eq $dep.$depsuffix;
+
+ my $src_dep = $srcpackage{$dep};
+ unless (defined($src_dep) && (!$deptype || grep
{ $_ eq $deptype } @{$src_dep->{buildtypes}})) {
+ warn sprintf "WARNING: Makefile '%s'
has a build dependency on '%s%s', which does not exist\n",
+ $src->{makefile}, $dep,
$depsuffix;
next;
}
- my $depstr = "\$(curdir)/$idx$suffix/compile";
+
+ my $depstr =
"\$(curdir)/$src_dep->{path}$depsuffix/compile";
my $depline = get_conditional_dep($condition,
$depstr);
if ($depline) {
- $deplines{$depline}++;
+ $deplines{$suffix}->{$depline}++;
}
[LEDE-DEV] [PATCH 14/15] build: remove obsolete "package feature" feature
Package "features" seem to be unused for some time. In any case, custom
Config.in snippets and package PROVIDES are a much more flexible way to
express similar options.
Signed-off-by: Matthias Schiffer
---
include/package-dumpinfo.mk | 25 -
scripts/metadata.pm | 23 +--
scripts/package-metadata.pl | 26 --
3 files changed, 1 insertion(+), 73 deletions(-)
diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 7cc8f3f6dc..68a66d0769 100644
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -49,29 +49,4 @@ $(Package/$(1)/config)
))
endef
-define Feature/Default
- TARGET_NAME:=
- TARGET_TITLE:=
- PRIORITY:=
- NAME:=
-endef
-
-define Feature
- $(eval $(Feature/Default))
- $(eval $(Feature/$(1)))
- $(if $(DUMP),$(call Dumpinfo/Feature,$(1)))
-endef
-
-define Dumpinfo/Feature
-$(info Feature: $(TARGET_NAME)_$(1)
-Target-Name: $(TARGET_NAME)
-Target-Title: $(TARGET_TITLE)
-Feature-Name: $(NAME)
-$(if $(PRIORITY),Feature-Priority: $(PRIORITY)
-)Feature-Description:
-$(Feature/$(1)/description)
-@@
-)
-endef
-
endif
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index bf93271749..18d5e5da24 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -2,13 +2,12 @@ package metadata;
use base 'Exporter';
use strict;
use warnings;
-our @EXPORT = qw(%package %vpackage %srcpackage %category %features %overrides
clear_packages parse_package_metadata parse_target_metadata get_multiline
@ignore %usernames %groupnames);
+our @EXPORT = qw(%package %vpackage %srcpackage %category %overrides
clear_packages parse_package_metadata parse_target_metadata get_multiline
@ignore %usernames %groupnames);
our %package;
our %vpackage;
our %srcpackage;
our %category;
-our %features;
our %overrides;
our @ignore;
@@ -181,7 +180,6 @@ sub clear_packages() {
%vpackage = ();
%srcpackage = ();
%category = ();
- %features = ();
%overrides = ();
%usernames = ();
%groupnames = ();
@@ -190,7 +188,6 @@ sub clear_packages() {
sub parse_package_metadata($) {
my $file = shift;
my $pkg;
- my $feature;
my $src;
my $override;
my %ignore = map { $_ => 1 } @ignore;
@@ -221,7 +218,6 @@ sub parse_package_metadata($) {
};
next unless $src;
/^Package:\s*(.+?)\s*$/ and do {
- undef $feature;
$pkg = {};
$pkg->{src} = $src;
$pkg->{name} = $1;
@@ -236,23 +232,6 @@ sub parse_package_metadata($) {
$vpackage{$1} or $vpackage{$1} = [];
unshift @{$vpackage{$1}}, $pkg;
};
- /^Feature:\s*(.+?)\s*$/ and do {
- undef $pkg;
- $feature = {};
- $feature->{name} = $1;
- $feature->{priority} = 0;
- };
- $feature and do {
- /^Target-Name:\s*(.+?)\s*$/ and do {
- $features{$1} or $features{$1} = [];
- push @{$features{$1}}, $feature unless
$src->{ignore};
- };
- /^Target-Title:\s*(.+?)\s*$/ and
$feature->{target_title} = $1;
- /^Feature-Priority:\s*(\d+)\s*$/ and
$feature->{priority} = $1;
- /^Feature-Name:\s*(.+?)\s*$/ and $feature->{title} = $1;
- /^Feature-Description:/ and $feature->{description} =
get_multiline(\*FILE, "\t\t\t");
- next;
- };
/^Build-Depends: \s*(.+)\s*$/ and $src->{builddepends} = [
split /\s+/, $1 ];
/^Build-Depends\/(\w+): \s*(.+)\s*$/ and
$src->{"builddepends/$1"} = [ split /\s+/, $2 ];
/^Build-Types:\s*(.+)\s*$/ and $src->{buildtypes} = [ split
/\s+/, $1 ];
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 41e7108322..e601a77e1b 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -337,31 +337,6 @@ sub print_package_config_category($) {
undef $category{$cat};
}
-sub print_package_features() {
- keys %features > 0 or return;
- print "menu \"Package features\"\n";
- foreach my $n (keys %features) {
- my @features = sort { $b->{priority} <=> $a->{priority} or
$a->{title} cmp $b->{title} } @{$features{$n}};
- print <{target_title}"
- default FEATURE_$features[0]->{name}
-EOF
-
- foreach my $feature (@features) {
- print <{name}
- bool "$feature->{title}"
-EOF
- $feature->{description} =~ /\w/ and do {
- print "\t\thelp\n".$feature->{description}."\n";
- };
-
[LEDE-DEV] [PATCH 09/15] build: remove package preconfig feature
This feature has been unused for years, and its scope is too limited to be
actually useful.
Signed-off-by: Matthias Schiffer
---
include/package-dumpinfo.mk | 16 +---
package/Makefile| 3 ---
scripts/metadata.pm | 20 +---
scripts/package-metadata.pl | 36
4 files changed, 2 insertions(+), 73 deletions(-)
diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 1be7d958d4..7cc8f3f6dc 100644
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -9,19 +9,6 @@ ifneq ($(DUMP),)
dumpinfo: FORCE
-define Config/template
-Preconfig: $(1)
-Preconfig-Type: $(2)
-Preconfig-Default: $(3)
-Preconfig-Label: $(4)
-
-endef
-
-define Config
- Preconfig/$(1) = $$(call Config/template,$(1),$(2),$(3),$(4))
- preconfig_$$(1) += $(1)
-endef
-
define Dumpinfo/Package
$(info Package: $(1)
$(if $(MENU),Menu: $(MENU)
@@ -59,8 +46,7 @@ $(if $(URL),$(URL)
$(if $(Package/$(1)/config),Config:
$(Package/$(1)/config)
@@
-)$(foreach pc,$(preconfig_$(1)),
-$(Preconfig/$(pc
+))
endef
define Feature/Default
diff --git a/package/Makefile b/package/Makefile
index 4fdf415046..0aefbb8023 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -72,7 +72,6 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if
$(CONFIG_TARGET_PER_DE
$(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \
done; \
done || true
- @-$(MAKE) package/preconfig
$(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG)
@@ -96,8 +95,6 @@ ifdef CONFIG_SIGNED_PACKAGES
); done
endif
-$(curdir)/preconfig:
-
$(curdir)/flags-install:= -j1
$(eval $(call stampfile,$(curdir),package,prereq,.config))
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 50f91407d6..bb3fa72403 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -2,10 +2,9 @@ package metadata;
use base 'Exporter';
use strict;
use warnings;
-our @EXPORT = qw(%package %srcpackage %category %preconfig %features
%overrides clear_packages parse_package_metadata parse_target_metadata
get_multiline @ignore %usernames %groupnames);
+our @EXPORT = qw(%package %srcpackage %category %features %overrides
clear_packages parse_package_metadata parse_target_metadata get_multiline
@ignore %usernames %groupnames);
our %package;
-our %preconfig;
our %srcpackage;
our %category;
our %features;
@@ -177,7 +176,6 @@ sub parse_target_metadata($) {
}
sub clear_packages() {
- %preconfig = ();
%package = ();
%srcpackage = ();
%category = ();
@@ -191,7 +189,6 @@ sub parse_package_metadata($) {
my $file = shift;
my $pkg;
my $feature;
- my $preconfig;
my $src;
my $override;
my %ignore = map { $_ => 1 } @ignore;
@@ -299,21 +296,6 @@ sub parse_package_metadata($) {
};
/^Config:\s*(.*)\s*$/ and $pkg->{config} =
"$1\n".get_multiline(*FILE, "\t");
/^Prereq-Check:/ and $pkg->{prereq} = 1;
- /^Preconfig:\s*(.+)\s*$/ and do {
- my $pkgname = $pkg->{name};
- $preconfig{$pkgname} or $preconfig{$pkgname} = {};
- if (exists $preconfig{$pkgname}->{$1}) {
- $preconfig = $preconfig{$pkgname}->{$1};
- } else {
- $preconfig = {
- id => $1
- };
- $preconfig{$pkgname}->{$1} = $preconfig unless
$src->{ignore};
- }
- };
- /^Preconfig-Type:\s*(.*?)\s*$/ and $preconfig->{type} = $1;
- /^Preconfig-Label:\s*(.*?)\s*$/ and $preconfig->{label} = $1;
- /^Preconfig-Default:\s*(.*?)\s*$/ and $preconfig->{default} =
$1;
/^Require-User:\s*(.*?)\s*$/ and do {
my @ugspecs = split /\s+/, $1;
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 233fb0eabf..9372191166 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -372,19 +372,6 @@ sub print_package_overrides() {
sub gen_package_config() {
parse_package_metadata($ARGV[0]) or exit 1;
print "menuconfig IMAGEOPT\n\tbool \"Image configuration\"\n\tdefault
n\n";
- foreach my $preconfig (keys %preconfig) {
- foreach my $cfg (keys %{$preconfig{$preconfig}}) {
- my $conf = $preconfig{$preconfig}->{$cfg}->{id};
- $conf =~ tr/\.-/__/;
- print <{$cfg}->{label}" if IMAGEOPT
- depends on PACKAGE_$preconfig
- default "$preconfig{$preconfig}->{$cfg}->{default}"
-
-EOF
- }
- }
print "source \"package/*/image-config.in\"\n";
if (scalar glob "package/feeds/*/*/image-config.in") {
[LEDE-DEV] [PATCH 13/15] metadata: always resolve dependencies through provides list
Instead of adding virtual packages to the normal package list, keep a
separate list for provides, make each package provide itself, and resolve
all dependencies through this list. This allows to use PROVIDES to replace
existing packages.
Fixes FS#837.
Signed-off-by: Matthias Schiffer
---
scripts/feeds | 4 +--
scripts/metadata.pm | 15 ++--
scripts/package-metadata.pl | 60 +++--
3 files changed, 34 insertions(+), 45 deletions(-)
diff --git a/scripts/feeds b/scripts/feeds
index b531fbac62..626edc6665 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -252,7 +252,6 @@ sub search_feed {
my $substr;
my $pkgmatch = 1;
- next if $pkg->{vdepends};
foreach my $substr (@substr) {
my $match;
foreach my $key (qw(name title description src)) {
@@ -306,7 +305,6 @@ sub list_feed {
get_feed($feed);
foreach my $name (sort { lc($a) cmp lc($b) } keys %$feed_package) {
my $pkg = $feed_package->{$name};
- next if $pkg->{vdepends};
if($pkg->{name}) {
printf "\%-32s\t\%s\n", $pkg->{name}, $pkg->{title};
}
@@ -530,6 +528,7 @@ sub install_package {
@{$feed_src->{$src}->{"builddepends/host"}},
map { @{$_->{depends}} } @{$feed_src->{$src}->{packages}}
) {
+ # TODO: handle virtual packages and PROVIDES
next if $dep =~ /@/;
$dep =~ s/^\+//;
$dep =~ s/^.+://;
@@ -590,7 +589,6 @@ sub install {
get_feed($f->[1]);
foreach my $name (sort { lc($a) cmp lc($b) }
keys %$feed_package) {
my $p = $feed_package->{$name};
- next if $p->{vdepends};
if( $p->{name} ) {
install_package($feed,
$p->{name}, exists($opts{f})) == 0 or $ret = 1;
get_feed($f->[1]);
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index bb3fa72403..bf93271749 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -2,9 +2,10 @@ package metadata;
use base 'Exporter';
use strict;
use warnings;
-our @EXPORT = qw(%package %srcpackage %category %features %overrides
clear_packages parse_package_metadata parse_target_metadata get_multiline
@ignore %usernames %groupnames);
+our @EXPORT = qw(%package %vpackage %srcpackage %category %features %overrides
clear_packages parse_package_metadata parse_target_metadata get_multiline
@ignore %usernames %groupnames);
our %package;
+our %vpackage;
our %srcpackage;
our %category;
our %features;
@@ -177,6 +178,7 @@ sub parse_target_metadata($) {
sub clear_packages() {
%package = ();
+ %vpackage = ();
%srcpackage = ();
%category = ();
%features = ();
@@ -230,6 +232,9 @@ sub parse_package_metadata($) {
$pkg->{override} = $override;
$package{$1} = $pkg;
push @{$src->{packages}}, $pkg;
+
+ $vpackage{$1} or $vpackage{$1} = [];
+ unshift @{$vpackage{$1}}, $pkg;
};
/^Feature:\s*(.+?)\s*$/ and do {
undef $pkg;
@@ -264,12 +269,8 @@ sub parse_package_metadata($) {
/^Provides: \s*(.+)\s*$/ and do {
my @vpkg = split /\s+/, $1;
foreach my $vpkg (@vpkg) {
- $package{$vpkg} or $package{$vpkg} = {
- name => $vpkg,
- vdepends => [],
- src => $src,
- };
- push @{$package{$vpkg}->{vdepends}},
$pkg->{name};
+ $vpackage{$vpkg} or $vpackage{$vpkg} = [];
+ push @{$vpackage{$vpkg}}, $pkg;
}
};
/^Menu-Depends: \s*(.+)\s*$/ and $pkg->{mdepends} = [ split
/\s+/, $1 ];
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 980ad24dc0..41e7108322 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -101,14 +101,16 @@ my %dep_check;
sub __find_package_dep($$) {
my $pkg = shift;
my $name = shift;
- my $deps = ($pkg->{vdepends} or $pkg->{depends});
+ my $deps = $pkg->{depends};
return 0 unless defined $deps;
- foreach my $dep (@{$deps}) {
- next if $dep_check{$dep};
- $dep_check{$dep} = 1;
- return 1 if $dep eq $name;
- return 1 if ($package{$dep} and
(__find_pa
[LEDE-DEV] [PATCH 04/15] metadata: move 'builddepends' from binary to source packages
Signed-off-by: Matthias Schiffer
---
scripts/feeds | 20 +++-
scripts/metadata.pm | 6 +++---
scripts/package-metadata.pl | 16 +++-
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/scripts/feeds b/scripts/feeds
index 42f7b3b116..31481edcb1 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -525,15 +525,17 @@ sub install_package {
};
# install all dependencies referenced from the source package
- foreach my $vpkg (@{$feed_src->{$src}->{packages}}) {
- foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}},
@{$vpkg->{"builddepends/host"}}) {
- next if $dep =~ /@/;
- $dep =~ s/^\+//;
- $dep =~ s/^.+://;
- $dep =~ s/\/.+$//;
- next unless $dep;
- install_package($feed, $dep, 0) == 0 or $ret = 1;
- }
+ foreach my $dep (
+ @{$feed_src->{$src}->{builddepends}},
+ @{$feed_src->{$src}->{"builddepends/host"}},
+ map { @{$_->{depends}} } @{$feed_src->{$src}->{packages}}
+ ) {
+ next if $dep =~ /@/;
+ $dep =~ s/^\+//;
+ $dep =~ s/^.+://;
+ $dep =~ s/\/.+$//;
+ next unless $dep;
+ install_package($feed, $dep, 0) == 0 or $ret = 1;
}
return $ret;
diff --git a/scripts/metadata.pm b/scripts/metadata.pm
index 985e6237a6..c150b547f1 100644
--- a/scripts/metadata.pm
+++ b/scripts/metadata.pm
@@ -215,6 +215,7 @@ sub parse_package_metadata($) {
$srcpackage{$src} = {
packages => [],
buildtypes => [],
+ builddepends => [],
};
$override = "";
undef $pkg;
@@ -234,7 +235,6 @@ sub parse_package_metadata($) {
$pkg->{title} = "";
$pkg->{depends} = [];
$pkg->{mdepends} = [];
- $pkg->{builddepends} = [];
$pkg->{subdir} = $subdir;
$pkg->{tristate} = 1;
$pkg->{override} = $override;
@@ -258,6 +258,8 @@ sub parse_package_metadata($) {
/^Feature-Description:/ and $feature->{description} =
get_multiline(\*FILE, "\t\t\t");
next;
};
+ /^Build-Depends: \s*(.+)\s*$/ and
$srcpackage{$src}->{builddepends} = [ split /\s+/, $1 ];
+ /^Build-Depends\/(\w+): \s*(.+)\s*$/ and
$srcpackage{$src}->{"builddepends/$1"} = [ split /\s+/, $2 ];
/^Build-Types:\s*(.+)\s*$/ and $srcpackage{$src}->{buildtypes}
= [ split /\s+/, $1 ];
next unless $pkg;
/^Version: \s*(.+)\s*$/ and $pkg->{version} = $1;
@@ -289,8 +291,6 @@ sub parse_package_metadata($) {
/^Build-Variant: \s*([\w\-]+)\s*/ and $pkg->{variant} = $1;
/^Default-Variant: .*/ and $pkg->{variant_default} = 1;
/^Build-Only: \s*(.+)\s*$/ and $pkg->{buildonly} = 1;
- /^Build-Depends: \s*(.+)\s*$/ and $pkg->{builddepends} = [
split /\s+/, $1 ];
- /^Build-Depends\/(\w+): \s*(.+)\s*$/ and
$pkg->{"builddepends/$1"} = [ split /\s+/, $2 ];
/^Repository:\s*(.+?)\s*$/ and $pkg->{repository} = $1;
/^Category: \s*(.+)\s*$/ and do {
$pkg->{category} = $1;
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
index 08c2343ade..a6cff40696 100755
--- a/scripts/package-metadata.pl
+++ b/scripts/package-metadata.pl
@@ -446,20 +446,18 @@ sub gen_package_mk() {
print "buildtypes-$pkg->{subdir}$pkg->{src} = ".join('
', @{$src->{buildtypes}})."\n";
}
- foreach my $spkg (@{$src->{packages}}) {
- foreach my $dep (@{$spkg->{depends}},
@{$spkg->{builddepends}}) {
- $dep =~ /@/ or do {
- $dep =~ s/\+//g;
- push @srcdeps, $dep;
- };
- }
+ foreach my $dep (@{$src->{builddepends}}, map {
@{$_->{depends}} } @{$src->{packages}}) {
+ $dep =~ /@/ or do {
+ $dep =~ s/\+//g;
+ push @srcdeps, $dep;
+ };
}
foreach my $type (@{$src->{buildtypes}}) {
my @extra_deps;
my %deplines;
- next unless $pkg->{"builddepends/$type"};
- foreach my $dep (@{$pkg->{"builddepends/$type"}}) {
+ next unless $src->{"builddepen
[LEDE-DEV] Bug? Routes of disabled interfaces appear in routing table
Hello, I discovered an issue with disabled interfaces propagating routes to sepcified tables. Given: config interface 'internet_share' option ifname '@wan' option proto 'dhcp' option ip4table '65' config interface 'internet_share6' option ifname '@wan' option proto 'dhcpv6' option ip6table '65' This config duplicates all WAN-Routes to table 65 and works as intended, in my freifunk policy routing setup. However, adding option enabled '0' doesn't seem to have any effect. The routes appear anyway. Am I missing sth.? Thanks, yanosz -- For those of you without hope, we have rooms with color TV, cable and air conditioning ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] ar71xx: sort kernel configurations
The symbols in some kernel configurations of the target are in wrong order. Sort them with kconfig.pl. Signed-off-by: Gabor Juhos --- target/linux/ar71xx/config-4.4 | 4 ++-- target/linux/ar71xx/config-4.9 | 4 ++-- target/linux/ar71xx/mikrotik/config-default | 2 +- target/linux/ar71xx/nand/config-default | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 3ba3853720..5a8004a03e 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -199,10 +199,10 @@ CONFIG_ATH79_MACH_TL_WDR4300=y CONFIG_ATH79_MACH_TL_WDR6500_V2=y CONFIG_ATH79_MACH_TL_WPA8630=y CONFIG_ATH79_MACH_TL_WR1041N_V2=y -CONFIG_ATH79_MACH_TL_WR1043N_V5=y CONFIG_ATH79_MACH_TL_WR1043ND=y CONFIG_ATH79_MACH_TL_WR1043ND_V2=y CONFIG_ATH79_MACH_TL_WR1043ND_V4=y +CONFIG_ATH79_MACH_TL_WR1043N_V5=y CONFIG_ATH79_MACH_TL_WR2543N=y CONFIG_ATH79_MACH_TL_WR703N=y CONFIG_ATH79_MACH_TL_WR720N_V3=y @@ -226,8 +226,8 @@ CONFIG_ATH79_MACH_UBNT=y CONFIG_ATH79_MACH_UBNT_UNIFIAC=y CONFIG_ATH79_MACH_UBNT_XM=y CONFIG_ATH79_MACH_WEIO=y -# CONFIG_ATH79_MACH_WI2A_AC200I is not set CONFIG_ATH79_MACH_WHR_HP_G300N=y +# CONFIG_ATH79_MACH_WI2A_AC200I is not set CONFIG_ATH79_MACH_WLAE_AG300N=y CONFIG_ATH79_MACH_WLR8100=y CONFIG_ATH79_MACH_WNDAP360=y diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9 index 1d47246bf3..4334d25b80 100644 --- a/target/linux/ar71xx/config-4.9 +++ b/target/linux/ar71xx/config-4.9 @@ -197,10 +197,10 @@ CONFIG_ATH79_MACH_TL_WDR4300=y CONFIG_ATH79_MACH_TL_WDR6500_V2=y CONFIG_ATH79_MACH_TL_WPA8630=y CONFIG_ATH79_MACH_TL_WR1041N_V2=y -CONFIG_ATH79_MACH_TL_WR1043N_V5=y CONFIG_ATH79_MACH_TL_WR1043ND=y CONFIG_ATH79_MACH_TL_WR1043ND_V2=y CONFIG_ATH79_MACH_TL_WR1043ND_V4=y +CONFIG_ATH79_MACH_TL_WR1043N_V5=y CONFIG_ATH79_MACH_TL_WR2543N=y CONFIG_ATH79_MACH_TL_WR703N=y CONFIG_ATH79_MACH_TL_WR720N_V3=y @@ -224,8 +224,8 @@ CONFIG_ATH79_MACH_UBNT=y CONFIG_ATH79_MACH_UBNT_UNIFIAC=y CONFIG_ATH79_MACH_UBNT_XM=y CONFIG_ATH79_MACH_WEIO=y -# CONFIG_ATH79_MACH_WI2A_AC200I is not set CONFIG_ATH79_MACH_WHR_HP_G300N=y +# CONFIG_ATH79_MACH_WI2A_AC200I is not set CONFIG_ATH79_MACH_WLAE_AG300N=y CONFIG_ATH79_MACH_WLR8100=y CONFIG_ATH79_MACH_WNDAP360=y diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default index b67fca1f14..7a2e9186af 100644 --- a/target/linux/ar71xx/mikrotik/config-default +++ b/target/linux/ar71xx/mikrotik/config-default @@ -159,10 +159,10 @@ CONFIG_ATH79_MACH_RBSXTLITE=y # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set # CONFIG_ATH79_MACH_TL_WPA8630 is not set # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set -# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set # CONFIG_ATH79_MACH_TL_WR1043ND is not set # CONFIG_ATH79_MACH_TL_WR1043ND_V2 is not set # CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set +# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set # CONFIG_ATH79_MACH_TL_WR2543N is not set # CONFIG_ATH79_MACH_TL_WR703N is not set # CONFIG_ATH79_MACH_TL_WR720N_V3 is not set diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default index f7c54e7d3c..d85a21d91a 100644 --- a/target/linux/ar71xx/nand/config-default +++ b/target/linux/ar71xx/nand/config-default @@ -155,10 +155,10 @@ CONFIG_ATH79_MACH_RAMBUTAN=y # CONFIG_ATH79_MACH_TL_WDR6500_V2 is not set # CONFIG_ATH79_MACH_TL_WPA8630 is not set # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set -# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set # CONFIG_ATH79_MACH_TL_WR1043ND is not set # CONFIG_ATH79_MACH_TL_WR1043ND_V2 is not set # CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set +# CONFIG_ATH79_MACH_TL_WR1043N_V5 is not set # CONFIG_ATH79_MACH_TL_WR2543N is not set # CONFIG_ATH79_MACH_TL_WR703N is not set # CONFIG_ATH79_MACH_TL_WR720N_V3 is not set -- 2.14.3 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] ar71xx: fix Kconfig dependency of the 88E6063 switch DSA driver
The Marvell 88E6063 ethernet switch driver depends on the DSA framework. Add a 'depends on NET_DSA' statement to its Kconfig entry to state that explicitly. Fixes the following Kconfig warning: warning: (NET_DSA_MV88E6060 && NET_DSA_MV88E6063) selects NET_DSA_TAG_TRAILER which has unmet direct dependencies (NET && NET_DSA) Signed-off-by: Gabor Juhos --- target/linux/ar71xx/patches-4.4/423-dsa-add-88e6063-driver.patch | 3 ++- target/linux/ar71xx/patches-4.9/423-dsa-add-88e6063-driver.patch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/patches-4.4/423-dsa-add-88e6063-driver.patch b/target/linux/ar71xx/patches-4.4/423-dsa-add-88e6063-driver.patch index 1348cd9b04..c6b9cafade 100644 --- a/target/linux/ar71xx/patches-4.4/423-dsa-add-88e6063-driver.patch +++ b/target/linux/ar71xx/patches-4.4/423-dsa-add-88e6063-driver.patch @@ -1,11 +1,12 @@ --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig -@@ -13,6 +13,13 @@ config NET_DSA_MV88E6060 +@@ -13,6 +13,14 @@ config NET_DSA_MV88E6060 This enables support for the Marvell 88E6060 ethernet switch chip. +config NET_DSA_MV88E6063 + bool "Marvell 88E6063 ethernet switch chip support" ++ depends on NET_DSA + select NET_DSA_TAG_TRAILER + ---help--- +This enables support for the Marvell 88E6063 ethernet switch diff --git a/target/linux/ar71xx/patches-4.9/423-dsa-add-88e6063-driver.patch b/target/linux/ar71xx/patches-4.9/423-dsa-add-88e6063-driver.patch index 1df93e9965..dbf892b434 100644 --- a/target/linux/ar71xx/patches-4.9/423-dsa-add-88e6063-driver.patch +++ b/target/linux/ar71xx/patches-4.9/423-dsa-add-88e6063-driver.patch @@ -1,11 +1,12 @@ --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig -@@ -9,6 +9,13 @@ config NET_DSA_MV88E6060 +@@ -9,6 +9,14 @@ config NET_DSA_MV88E6060 This enables support for the Marvell 88E6060 ethernet switch chip. +config NET_DSA_MV88E6063 + bool "Marvell 88E6063 ethernet switch chip support" ++ depends on NET_DSA + select NET_DSA_TAG_TRAILER + ---help--- +This enables support for the Marvell 88E6063 ethernet switch -- 2.14.3 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Bug? Routes of disabled interfaces appear in routing table
Hi yanosz, "option enabled" is not defined for /etc/config/network, config interface as far as I know. Maybe you meant "option auto 0" instead? Regards, Jo ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 13/15] metadata: always resolve dependencies through provides list
Hi,
[...]
> diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl
> index 980ad24dc0..41e7108322 100755
> --- a/scripts/package-metadata.pl
> +++ b/scripts/package-metadata.pl
> @@ -101,14 +101,16 @@ my %dep_check;
> sub __find_package_dep($$) {
> my $pkg = shift;
> my $name = shift;
> - my $deps = ($pkg->{vdepends} or $pkg->{depends});
> + my $deps = $pkg->{depends};
>
> return 0 unless defined $deps;
> - foreach my $dep (@{$deps}) {
> - next if $dep_check{$dep};
> - $dep_check{$dep} = 1;
> - return 1 if $dep eq $name;
> - return 1 if ($package{$dep} and
> (__find_package_dep($package{$dep},$name) == 1));
> + foreach my $vpkg (@{$deps}) {
> + foreach my $dep (@{$vpackage{$vpkg}}) {
> + next if $dep_check{$dep->{name}};
> + $dep_check{$dep->{name}} = 1;
> + return 1 if $dep->{name} eq $name;
> + return 1 if (__find_package_dep($dep, $name) == 1);
> + }
> }
> return 0;
> }
> @@ -156,7 +158,6 @@ sub mconf_depends {
> my $m = "depends on";
> my $flags = "";
> $depend =~ s/^([@\+]+)// and $flags = $1;
> - my $vdep;
> my $condition = $parent_condition;
>
> next if $condition eq $depend;
> @@ -173,23 +174,21 @@ sub mconf_depends {
> }
> $depend = $2;
> }
> - next if $package{$depend} and $package{$depend}->{buildonly};
> if ($flags =~ /\+/) {
> - if ($vdep = $package{$depend}->{vdepends}) {
> + my $vdep = $vpackage{$depend};
> + if ($vdep) {
> my @vdeps;
> - $depend = undef;
>
> foreach my $v (@$vdep) {
> - if ($package{$v} &&
> $package{$v}->{variant_default}) {
> - $depend = $v;
> + next if $v->{buildonly};
> + if ($v->{variant_default}) {
> + unshift @vdeps, $v->{name};
> } else {
> - push @vdeps, $v;
> + push @vdeps, $v->{name};
> }
> }
>
> - if (!$depend) {
> - $depend = shift @vdeps;
> - }
> + $depend = shift @vdeps;
>
> if (@vdeps > 1) {
> $condition = ($condition ? "$condition
> && " : '') . '!('.join("||", map { "PACKAGE_".$_ } @vdeps).')';
> @@ -209,7 +208,8 @@ sub mconf_depends {
>
> $flags =~ /@/ or $depend = "PACKAGE_$depend";
> } else {
> - if ($vdep = $package{$depend}->{vdepends}) {
> + my $vdep = $vpackage{$depend};
> + if ($vdep) {
> $depend = join("||", map { "PACKAGE_".$_ }
> @$vdep);
Use "PACKAGE_".$_->{name} here as "$vdep" now is a reference to an array
of package structures, not package names anymore.
~ Jo
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Espressobin mvebu64
Hi, 2018-01-06 12:12 GMT+01:00, Nishant Sharma : > Hi Hauke, > > On Friday 05 January 2018 11:33 PM, Hauke Mehrtens wrote: >> I have never looked at the OpenWrt fork provided by Marvell, but I got >> OpenWrt master working on the espressobin with kernel 4.14. It only has >> a low number of patches mainly for the other mvebu broads and for sfp >> support. >> >> You can find my git tree here: >> https://git.lede-project.org/?p=openwrt/staging/hauke.git;a=shortlog;h=refs/heads/mvebu-4.14 >> >> Tomasz did some additional extensions to it see here: >> https://github.com/tmn505/source/commits/espressobin > > That sounds great! > > I will try building both of them and report back. > > Is the built 64 bits? Any tentative plans to bring it to mainstream > OpenWrt please? > > Regards, > Nishant > I updated my tree from the previous time You probably saw it. Most of the features are complete. It requires to edit U-Boot environment with this value: bootcmd=load mmc 0:1 0x4d0 boot.scr; source 0x4d0 With that it should boot without manual intervention. What is left out: a) mini PCIe shouldn't work ATM here are some patches: https://patchwork.ozlabs.org/cover/819585 You should omit the last one, b) booting from other mediums than SD card, c) sysupgrade on other mediums than SD card. I'll appreciate any feedback. -- Regards, Tomasz ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 00/15] Metadata generator refactoring, cleanup and PROVIDES improvements
On 01/08/2018 03:52 PM, Matthias Schiffer wrote:
> When attempting to fix FS#837, I decided to treat our metadata generator to
> a greater refactoring, which resulted in this patchset. FS#837 is fixed in
> patch 13.
>
> I also removed two seemingly obsolete features, "preconfig" and "package
> features", which are not used by any package in the OpenWrt/LEDE base or
> our default feeds.
>
> The changes in this patchset also improve dependency diagnostics and
> clearly separate between build depends (on source packages) and runtime
> depends (on binary packages, implying build depends). This requires some
> fixes in package Makefiles with broken dependencies (patch 10, [1], [2]).
>
> There are also broken runtime depends in many feed packages, which I did
> not fix, but which will be shown more prominently during prepare-tmpinfo
> now. I'm not sure what the best way to handle such broken dependencies is,
> as they might also be caused by missing feeds, e.g. LuCI depending on
> telephony packages.
> - Keep the warning, but try to build the packages as before (current
> solution in this patchset)?
> - Hide the warning again (old state)?
> - Ignore packages with missing build dependencies altogether (just show a
> warning in the metadata generators)?
>
> As hinted in patch 15, I have further refactoring in mind, but let's try to
> get this set reviewed and committed first...
>
> Regards,
> Matthias
I've pushed an updated branch fixing the mistake Jo pointed out and some
other stylistic improvements to the metadata2 branch of my staging tree [3].
> [1] https://github.com/openwrt/packages/pull/5370
> [2] https://github.com/openwrt-routing/packages/pull/345
[3]
https://git.lede-project.org/?p=openwrt/staging/neoraider.git;a=shortlog;h=refs/heads/metadata2
>
>
> Matthias Schiffer (15):
> metadata: remove 'base-files' special case
> metadata: make srcpackage extensible
> metadata: move 'buildtypes' from binary to source packages
> metadata: move 'builddepends' from binary to source packages
> metadata: interate over source packages when generating Makefile
> metadata: change pkg->{src} field to hold a reference
> metadata: replace %subdir hash with a path field in source packages
> metadata: remove redundant fields from package hash
> build: remove package preconfig feature
> treewide: fix build depends to refer to source package names
> metadata: handle target build depends together with host build depends
> metadata: simplify generation of build depends from runtime depends
> metadata: always resolve dependencies through provides list
> build: remove obsolete "package feature" feature
> include/package-dumpinfo.mk: don't duplicate source package
> information for every binary package
>
> include/autotools.mk | 4 +-
> include/nls.mk | 2 +-
> include/package-dumpinfo.mk | 53 +
> package/Makefile | 3 -
> package/network/config/ltq-adsl-app/Makefile | 2 +-
> package/network/config/ltq-vdsl-app/Makefile | 2 +-
> scripts/feeds| 28 +--
> scripts/metadata.pm | 101 +++--
> scripts/package-metadata.pl | 299
> +--
> 9 files changed, 158 insertions(+), 336 deletions(-)
>
signature.asc
Description: OpenPGP digital signature
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Bug? Routes of disabled interfaces appear in routing table
Hallo, Am 2018-01-08 um 16:41 schrieb Jo-Philipp Wich: > Hi yanosz, > > "option enabled" is not defined for /etc/config/network, config > interface as far as I know. Maybe you meant "option auto 0" instead? Interesting. Looking at the docs it is supported: https://lede-project.org/docs/user-guide/network_configuration#options_valid_for_all_protocol_types If you're we should update the docs. Greetz, yanosz > -- For those of you without hope, we have rooms with color TV, cable and air conditioning ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v1] kernel: bump 4.9 to 4.9.75
Thank you. I think we ought to demand a product recall for everything Intel. signature.asc Description: PGP signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/1] at91: update kernel 4.9.73 to 4.14.11
update at91 kernel 4.9.73 to 4.14.11
Signed-off-by: Sandeep Sheriker Mallikarjun
---
target/linux/at91/Makefile | 2 +-
target/linux/at91/{config-4.9 => config-4.14} | 6 ++
.../100-ARM-at91-build-dtb-for-LMU5000.patch | 0
.../101-ARM-at91-build-dtb-for-q5xr5.patch | 0
.../102-ARM-at91-build-dtb-for-wb45n.patch | 0
.../103-ARM-at91-build-dtb-for-wb50n.patch | 0
target/linux/at91/sama5/config-default | 7 +++
7 files changed, 14 insertions(+), 1 deletion(-)
rename target/linux/at91/{config-4.9 => config-4.14} (97%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/100-ARM-at91-build-dtb-for-LMU5000.patch (100%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/101-ARM-at91-build-dtb-for-q5xr5.patch (100%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/102-ARM-at91-build-dtb-for-wb45n.patch (100%)
rename target/linux/at91/{patches-4.9 =>
patches-4.14}/103-ARM-at91-build-dtb-for-wb50n.patch (100%)
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index cae3c62..4dc70eb 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -13,7 +13,7 @@ BOARDNAME:=Microchip (Atmel AT91)
FEATURES:=ext4 squashfs targz usb usbgadget ubifs
SUBTARGETS:=sama5 legacy
-KERNEL_PATCHVER:=4.9
+KERNEL_PATCHVER:=4.14
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.14
similarity index 97%
rename from target/linux/at91/config-4.9
rename to target/linux/at91/config-4.14
index c0151a5..4fdaccd 100644
--- a/target/linux/at91/config-4.9
+++ b/target/linux/at91/config-4.14
@@ -271,3 +271,9 @@ CONFIG_ZBOOT_ROM_BSS=0
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
+CONFIG_DEBUG_USER=y
+CONFIG_DEBUG_ALIGN_RODATA=y
+CONFIG_AT91_SOC_ID=y
+# CONFIG_TEE is not set
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_MACB_USE_HWSTAMP=y
diff --git
a/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch
b/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
similarity index 100%
rename from
target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch
rename to
target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch
diff --git
a/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch
b/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch
rename to target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch
diff --git
a/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch
b/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch
rename to target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch
diff --git
a/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch
b/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
similarity index 100%
rename from target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch
rename to target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch
diff --git a/target/linux/at91/sama5/config-default
b/target/linux/at91/sama5/config-default
index 736f76b..b720363 100644
--- a/target/linux/at91/sama5/config-default
+++ b/target/linux/at91/sama5/config-default
@@ -8,7 +8,10 @@ CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_ARM_PATCH_IDIV=y
# CONFIG_ARM_THUMBEE is not set
CONFIG_ARM_VIRT_EXT=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
CONFIG_ATMEL_AIC5_IRQ=y
+CONFIG_ARM_THUMB=y
+# CONFIG_ARM_THUMBEE is not set
CONFIG_CACHE_L2X0=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_32v7=y
@@ -83,6 +86,10 @@ CONFIG_DRM_GEM_CMA_HELPER=y
CONFIG_DRM_KMS_CMA_HELPER=y
ONFIG_DST_CACHE=y
CONFIG_DCACHE_WORD_ACCESS=y
+
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+
#
# At least one emulation must be selected
#
--
2.7.4
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Bug? Routes of disabled interfaces appear in routing table
The common option on an interface that disables/enables it is named "disabled". Just corrected wiki entry accordingly. Regards, Paul > Op 8 jan. 2018, om 20:06 heeft yanosz het volgende > geschreven: > > Hallo, > > > Am 2018-01-08 um 16:41 schrieb Jo-Philipp Wich: >> Hi yanosz, >> >> "option enabled" is not defined for /etc/config/network, config >> interface as far as I know. Maybe you meant "option auto 0" instead? > > Interesting. Looking at the docs it is supported: > https://lede-project.org/docs/user-guide/network_configuration#options_valid_for_all_protocol_types > > If you're we should update the docs. > > Greetz, yanosz > >> > > -- > For those of you without hope, we have rooms with color TV, > cable and air conditioning > > ___ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 6/6] at91: create device specific sdcard images
Without this patch one sdcard image with the following name is created for all devices: openwrt-at91-sama5--sdcard.img.gz This makes the build system create device specific versions like: openwrt-at91-sama5-at91-sama5d2_xplained-sdcard.img.gz Signed-off-by: Hauke Mehrtens --- target/linux/at91/image/sama5.mk | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk index d33a398651..b251d714dc 100644 --- a/target/linux/at91/image/sama5.mk +++ b/target/linux/at91/image/sama5.mk @@ -20,16 +20,16 @@ define Build/at91-sdcard mcopy -i $@.boot $(BIN_DIR)/BOOT.bin ::BOOT.bin;) ./gen_at91_sdcard_img.sh \ - $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \ + $(dir $@)$(IMG_PREFIX)-$(DEVICE_NAME)-sdcard.img \ $@.boot \ $(KDIR)/root.ext4 \ $(AT91_SD_BOOT_PARTSIZE) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) - gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img \ - > $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz + gzip -nc9 $(dir $@)$(IMG_PREFIX)-$(DEVICE_NAME)-sdcard.img \ + > $(dir $@)$(IMG_PREFIX)-$(DEVICE_NAME)-sdcard.img.gz - $(CP) $(dir $@)$(IMG_PREFIX)-$(PROFILE_SANITIZED)-sdcard.img.gz \ + $(CP) $(dir $@)$(IMG_PREFIX)-$(DEVICE_NAME)-sdcard.img.gz \ $(BIN_DIR)/ rm -f $(BIN_DIR)/BOOT.bin -- 2.11.0 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 4/6] at91bootstrap: make packages hidden
These packages are needed to generate the image, better mark them hidden so we will activate them based on which boards gets build and they will be activated always when the board which needs then gets build. Signed-off-by: Hauke Mehrtens --- package/boot/at91bootstrap/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index b0cd692a59..e1e389670d 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/package.mk define AT91Bootstrap/Default BUILD_TARGET:=at91 BUILD_SUBTARGET:=sama5 + HIDDEN:=1 AT91BOOTSTRAP_IMAGE:=at91bootstrap.bin endef -- 2.11.0 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/6] at91bootstrap: fix name of sama5d4_xplainednf_uboot
The default configuration file for sama5d4_xplainednf_uboot does not
exist, but a default configuration file for
sama5d4_xplainednf_uboot_secure exists, fix the name.
Fixes: 670448a002 ("at91bootstrap: New package at91bootstrap")
Signed-off-by: Hauke Mehrtens
---
package/boot/at91bootstrap/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/boot/at91bootstrap/Makefile
b/package/boot/at91bootstrap/Makefile
index 4571fedc04..a0b0594fb2 100644
--- a/package/boot/at91bootstrap/Makefile
+++ b/package/boot/at91bootstrap/Makefile
@@ -58,7 +58,7 @@ define at91bootstrap/sama5d3_xplainedsd_uboot
BUILD_DEVICES:=at91-sama5d3_xplained
endef
-define at91bootstrap/sama5d4_xplainednf_uboot
+define at91bootstrap/sama5d4_xplainednf_uboot_secure
TITLE:=AT91Bootstrap for the SAMA5D4 Xplained board (Nand Flash)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d4_xplained
--
2.11.0
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/6] at91bootstrap: fix name of packages
The packages should start with AT91Bootstrap and not at91bootstrap to use the
default definition.
Without this patch the packages are not getting selected automatically
when the board gets selected, but this is needed to successfully create
the image.
Fixes: 670448a002 ("at91bootstrap: New package at91bootstrap")
Signed-off-by: Hauke Mehrtens
---
package/boot/at91bootstrap/Makefile | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/boot/at91bootstrap/Makefile
b/package/boot/at91bootstrap/Makefile
index a0b0594fb2..002c68b138 100644
--- a/package/boot/at91bootstrap/Makefile
+++ b/package/boot/at91bootstrap/Makefile
@@ -28,49 +28,49 @@ define AT91Bootstrap/Default
AT91BOOTSTRAP_IMAGE:=at91bootstrap.bin
endef
-define at91bootstrap/sama5d2_xplaineddf_uboot
+define AT91Bootstrap/sama5d2_xplaineddf_uboot
TITLE:=AT91Bootstrap for the SAMA5D2 Xplained board (SPI Flash)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d2_xplained
endef
-define at91bootstrap/sama5d2_xplaineddf_qspi_uboot
+define AT91Bootstrap/sama5d2_xplaineddf_qspi_uboot
TITLE:=AT91Bootstrap for the SAMA5D2 Xplained board (QSPI Flash)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d2_xplained
endef
-define at91bootstrap/sama5d2_xplainedsd_uboot
+define AT91Bootstrap/sama5d2_xplainedsd_uboot
TITLE:=AT91Bootstrap for the SAMA5D2 Xplained board (SDcard/EMMC)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d2_xplained
endef
-define at91bootstrap/sama5d3_xplainednf_uboot
+define AT91Bootstrap/sama5d3_xplainednf_uboot
TITLE:=AT91Bootstrap for the SAMA5D3 Xplained board (Nand Flash)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d3_xplained
endef
-define at91bootstrap/sama5d3_xplainedsd_uboot
+define AT91Bootstrap/sama5d3_xplainedsd_uboot
TITLE:=AT91Bootstrap for the SAMA5D3 Xplained board (SDcard)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d3_xplained
endef
-define at91bootstrap/sama5d4_xplainednf_uboot_secure
+define AT91Bootstrap/sama5d4_xplainednf_uboot_secure
TITLE:=AT91Bootstrap for the SAMA5D4 Xplained board (Nand Flash)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d4_xplained
endef
-define at91bootstrap/sama5d4_xplaineddf_uboot_secure
+define AT91Bootstrap/sama5d4_xplaineddf_uboot_secure
TITLE:=AT91Bootstrap for the SAMA5D4 Xplained board (SPI Flash)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d4_xplained
endef
-define at91bootstrap/sama5d4_xplainedsd_uboot_secure
+define AT91Bootstrap/sama5d4_xplainedsd_uboot_secure
TITLE:=AT91Bootstrap for the SAMA5D4 Xplained board (SDcard)
BUILD_SUBTARGET:=sama5
BUILD_DEVICES:=at91-sama5d4_xplained
--
2.11.0
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 3/6] at91bootstrap: remove redundant definition of BUILD_SUBTARGET
It is sufficient to define this in AT91Bootstrap/Default as this is not used for all. Signed-off-by: Hauke Mehrtens --- package/boot/at91bootstrap/Makefile | 8 1 file changed, 8 deletions(-) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 002c68b138..b0cd692a59 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -30,49 +30,41 @@ endef define AT91Bootstrap/sama5d2_xplaineddf_uboot TITLE:=AT91Bootstrap for the SAMA5D2 Xplained board (SPI Flash) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define AT91Bootstrap/sama5d2_xplaineddf_qspi_uboot TITLE:=AT91Bootstrap for the SAMA5D2 Xplained board (QSPI Flash) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define AT91Bootstrap/sama5d2_xplainedsd_uboot TITLE:=AT91Bootstrap for the SAMA5D2 Xplained board (SDcard/EMMC) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define AT91Bootstrap/sama5d3_xplainednf_uboot TITLE:=AT91Bootstrap for the SAMA5D3 Xplained board (Nand Flash) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef define AT91Bootstrap/sama5d3_xplainedsd_uboot TITLE:=AT91Bootstrap for the SAMA5D3 Xplained board (SDcard) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef define AT91Bootstrap/sama5d4_xplainednf_uboot_secure TITLE:=AT91Bootstrap for the SAMA5D4 Xplained board (Nand Flash) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define AT91Bootstrap/sama5d4_xplaineddf_uboot_secure TITLE:=AT91Bootstrap for the SAMA5D4 Xplained board (SPI Flash) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define AT91Bootstrap/sama5d4_xplainedsd_uboot_secure TITLE:=AT91Bootstrap for the SAMA5D4 Xplained board (SDcard) - BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef -- 2.11.0 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 5/6] uboot-at91: make packages hidden
These packages are needed to generate the image, better mark them hidden so we will activate them based on which boards gets build and they will be activated always when the board which needs then gets build. Signed-off-by: Hauke Mehrtens --- package/boot/uboot-at91/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 268b254206..cad12ec2f8 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -17,6 +17,7 @@ include $(INCLUDE_DIR)/package.mk define U-Boot/Default BUILD_TARGET:=at91 + HIDDEN:=1 UBOOT_IMAGE:=u-boot.bin boot.bin endef -- 2.11.0 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH 4/6] at91bootstrap: make packages hidden
Hi Hauke, I have already fixed this and submitted this patch. below is the patch link for references. https://patchwork.ozlabs.org/patch/855788/ Regards, Sandeep Sheriker M On 01/08/2018 03:58 PM, Hauke Mehrtens wrote: These packages are needed to generate the image, better mark them hidden so we will activate them based on which boards gets build and they will be activated always when the board which needs then gets build. Signed-off-by: Hauke Mehrtens --- package/boot/at91bootstrap/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index b0cd692a59..e1e389670d 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/package.mk define AT91Bootstrap/Default BUILD_TARGET:=at91 BUILD_SUBTARGET:=sama5 + HIDDEN:=1 AT91BOOTSTRAP_IMAGE:=at91bootstrap.bin endef ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 3/3] uboot-at91: Add support for SAMA5D27 SOM1 EK board
Add support for SAMA5D27 SOM1 EK board. Signed-off-by: Sandeep Sheriker Mallikarjun --- package/boot/uboot-at91/Makefile | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index ae2e888..c1d5cac 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=2016.05 +PKG_VERSION:=2017.11 PKG_RELEASE:=1 -PKG_HASH:=87d02275615aaf0cd007b54cbe9fbadceef2bee7c79e6c323ea1ae8956dcb171 +PKG_HASH:=6a018fd3caf58f3dcfa23ee989a82bd35df03af71872b9dca8c6d758a0d26c05 include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk @@ -74,6 +74,12 @@ define U-Boot/sama5d4_xplained_nandflash BUILD_DEVICES:=at91-sama5d4_xplained endef +define U-Boot/sama5d27_som1_ek_mmc + NAME:=SAMA5D27 SOM1 EK (SDcard) + BUILD_SUBTARGET:=sama5 + BUILD_DEVICES:=at91-sama5d27_som1_ek +endef + UBOOT_TARGETS := \ at91sam9m10g45ek_nandflash \ at91sam9x5ek_nandflash \ @@ -83,7 +89,8 @@ UBOOT_TARGETS := \ sama5d2_xplained_spiflash \ sama5d4_xplained_mmc \ sama5d4_xplained_spiflash \ - sama5d4_xplained_nandflash + sama5d4_xplained_nandflash \ + sama5d27_som1_ek_mmc UBOOT_MAKE_FLAGS:= -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 0/3] Add AT91 SAMA5D27 SOM1 EK board
This patch series includes adding support of SAMA5D27 SOM1 Ek board Sandeep Sheriker Mallikarjun (3): at91:Add SAMA5D27 SOM1 EK device at91bootstrap: Add support for SAMA5D27 SOM1 EK board uboot-at91: Add support for SAMA5D27 SOM1 EK board package/boot/at91bootstrap/Makefile | 20 +--- package/boot/uboot-at91/Makefile | 13 ++--- target/linux/at91/base-files/lib/at91.sh | 3 +++ target/linux/at91/image/sama5.mk | 8 4 files changed, 38 insertions(+), 6 deletions(-) -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/3] at91:Add SAMA5D27 SOM1 EK device
Add support for SAMA5D27 with target device as at91-sama5d27_som1_ek
in SAMA5 subtarget and build images for SAMA5D27 SOM1 EK board.
Signed-off-by: Sandeep Sheriker Mallikarjun
---
target/linux/at91/base-files/lib/at91.sh | 3 +++
target/linux/at91/image/sama5.mk | 8
2 files changed, 11 insertions(+)
diff --git a/target/linux/at91/base-files/lib/at91.sh
b/target/linux/at91/base-files/lib/at91.sh
index 61921ed..50812de 100755
--- a/target/linux/at91/base-files/lib/at91.sh
+++ b/target/linux/at91/base-files/lib/at91.sh
@@ -46,6 +46,9 @@ at91_board_detect() {
*"SAMA5D2 Xplained")
name="sama5d2_xplained"
;;
+ *"SAMA5D27 SOM1 EK")
+ name="sama5d27_SOM1_EK"
+ ;;
*"SAMA5D4 Xplained")
name="sama5d4_xplained"
;;
diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk
index d33a398..1ed9066 100644
--- a/target/linux/at91/image/sama5.mk
+++ b/target/linux/at91/image/sama5.mk
@@ -64,6 +64,14 @@ define Device/at91-sama5d2_xplained
endef
TARGET_DEVICES += at91-sama5d2_xplained
+define Device/at91-sama5d27_som1_ek
+ $(Device/evaluation-dtb)
+ DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D27 SOM1 EK
+ KERNEL_SIZE := 6144k
+ $(Device/evaluation-sdimage)
+endef
+TARGET_DEVICES += at91-sama5d27_som1_ek
+
define Device/at91-sama5d4_xplained
$(Device/evaluation-dtb)
DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D4 Xplained
--
2.7.4
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/3] at91bootstrap: Add support for SAMA5D27 SOM1 EK board
1. Add support for SAMA5D27 SOM1 EK board 2. version update to v3.8.9 Signed-off-by: Sandeep Sheriker Mallikarjun --- package/boot/at91bootstrap/Makefile | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 5d5d2e5..6d27956 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=at91bootstrap -PKG_VERSION:=v3.8. +PKG_VERSION:=v3.8.9 PKG_RELEASE:= PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/at91bootstrap.git -PKG_SOURCE_VERSION:=3d33a4e0707c61007a5278f6620453502f7500db +PKG_SOURCE_VERSION:=f05a4df68b231b86d4a27fe43ef215baca9aee14 PKG_BUILD_DIR = \ $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -76,6 +76,18 @@ define AT91Bootstrap/sama5d4_xplainedsd_uboot_secure BUILD_DEVICES:=at91-sama5d4_xplained endef +define AT91Bootstrap/sama5d27_som1_ekqspi_uboot + TITLE:=AT91Bootstrap for SAMA5D27 SOM1 EK (QSPI Flash) + BUILD_SUBTARGET:=sama5 + BUILD_DEVICES:= at91-sama5d27_som1_ek +endef + +define AT91Bootstrap/sama5d27_som1_eksd_uboot + TITLE:=AT91Bootstrap for SAMA5D27 SOM1 EK (SDcard) + BUILD_SUBTARGET:=sama5 + BUILD_DEVICES:= at91-sama5d27_som1_ek +endef + AT91BOOTSTRAP_TARGETS := \ sama5d2_xplaineddf_uboot \ sama5d2_xplaineddf_qspi_uboot \ @@ -84,7 +96,9 @@ AT91BOOTSTRAP_TARGETS := \ sama5d3_xplainedsd_uboot \ sama5d4_xplainednf_uboot_secure \ sama5d4_xplaineddf_uboot_secure \ -sama5d4_xplainedsd_uboot_secure +sama5d4_xplainedsd_uboot_secure \ +sama5d27_som1_ekqspi_uboot \ +sama5d27_som1_eksd_uboot define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ -- 2.7.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Switches between LTS kernels and removal of previous LTSes
Sorry, now the non-HTML version... Hi guys, I remember there was quite a bit of gnashing of teeth, when targets in master dropped 4.4 support so quickly after 17.01 had been released (which made it very cumbersome to backport 4.4 kernel bumps from master to the stable branch). Wouldn't it be wiser to keep 4.9 kernels around for targets that are being bumped to 4.14? Cheers Stijn ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 3/3] ar71xx/mikrotik: disable TP-Link TL-WR810N v2 board support
It does not belongs to the MikroTik boards. Signed-off-by: Gabor Juhos --- target/linux/ar71xx/mikrotik/config-default | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default index da0c9dacc9..a77813d23d 100644 --- a/target/linux/ar71xx/mikrotik/config-default +++ b/target/linux/ar71xx/mikrotik/config-default @@ -171,6 +171,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y # CONFIG_ATH79_MACH_TL_WR802N_V1 is not set # CONFIG_ATH79_MACH_TL_WR802N_V2 is not set # CONFIG_ATH79_MACH_TL_WR810N is not set +# CONFIG_ATH79_MACH_TL_WR810N_V2 is not set # CONFIG_ATH79_MACH_TL_WR840N_V2 is not set # CONFIG_ATH79_MACH_TL_WR841N_V1 is not set # CONFIG_ATH79_MACH_TL_WR841N_V8 is not set -- 2.14.3 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 1/3] ar71xx/mikrotik: disable unused ethernet switch and phy drivers
Disable the drivers for the following ethernet switches: Realtek RTL8306 Realtek RTL8366/8367 Marvell 88E6060 (DSA) Marvell 88E6063 (DSA) Also disable the phy driver for Marvell PHYs. None of the supported RouterBOARDs are using any device which needs these drivers. Disable the DSA framework too, because it is not required by the remaining switch drivers. This reduces the compressed kernel size by ~20KB. Signed-off-by: Gabor Juhos --- target/linux/ar71xx/mikrotik/config-default | 4 1 file changed, 4 insertions(+) diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default index 7a2e9186af..815ac60e68 100644 --- a/target/linux/ar71xx/mikrotik/config-default +++ b/target/linux/ar71xx/mikrotik/config-default @@ -220,6 +220,7 @@ CONFIG_GPIO_LATCH=y # CONFIG_INTEL_XWAY_PHY is not set CONFIG_LEDS_RB750=y CONFIG_LZO_DECOMPRESS=y +# CONFIG_MARVELL_PHY is not set # CONFIG_MTD_CFI is not set CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CYBERTAN_PARTS is not set @@ -243,7 +244,10 @@ CONFIG_MTD_UBI_BLOCK=y # CONFIG_MTD_UBI_FASTMAP is not set # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_WL_THRESHOLD=4096 +# CONFIG_NET_DSA is not set CONFIG_RLE_DECOMPRESS=y +# CONFIG_RTL8306_PHY is not set +# CONFIG_RTL8366_SMI is not set # CONFIG_SOC_AR913X is not set # CONFIG_SOC_AR933X is not set # CONFIG_SOC_QCA956X is not set -- 2.14.3 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 2/3] ar71xx/mikrotik: disable unused MTD partitioning and split drivers
Reduces the compressed kernel size by ~2.5KB. Signed-off-by: Gabor Juhos --- target/linux/ar71xx/mikrotik/config-default | 6 ++ 1 file changed, 6 insertions(+) diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default index 815ac60e68..da0c9dacc9 100644 --- a/target/linux/ar71xx/mikrotik/config-default +++ b/target/linux/ar71xx/mikrotik/config-default @@ -223,6 +223,7 @@ CONFIG_LZO_DECOMPRESS=y # CONFIG_MARVELL_PHY is not set # CONFIG_MTD_CFI is not set CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CMDLINE_PARTS is not set # CONFIG_MTD_CYBERTAN_PARTS is not set CONFIG_MTD_MAP_BANK_WIDTH_1=y CONFIG_MTD_MAP_BANK_WIDTH_4=y @@ -233,10 +234,15 @@ CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_RB4XX=y CONFIG_MTD_NAND_RB750=y CONFIG_MTD_NAND_RB91X=y +# CONFIG_MTD_OF_PARTS is not set # CONFIG_MTD_REDBOOT_PARTS is not set CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y # CONFIG_MTD_SPLIT_EVA_FW is not set +# CONFIG_MTD_SPLIT_LZMA_FW is not set +# CONFIG_MTD_SPLIT_SEAMA_FW is not set # CONFIG_MTD_SPLIT_TPLINK_FW is not set +# CONFIG_MTD_SPLIT_UIMAGE_FW is not set +# CONFIG_MTD_SPLIT_WRGG_FW is not set # CONFIG_MTD_TPLINK_PARTS is not set CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BEB_LIMIT=20 -- 2.14.3 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH 0/3] ar71xx/mikrotik: disable unused kernel options
The kernel configuration of the mikrotik subtarget enables
several kernel options that are not required by the supported
MikroTik boards.
The patches in this series are disabling some of them to get
rid of the unused code and to reduce the size of the compiled
kernel.
The size of the compressed kernel is reduced by ~22.5KB after
the patches.
The patch set depends on the following patches:
https://patchwork.ozlabs.org/patch/856860/ ("ar71xx: sort kernel
configurations")
https://patchwork.ozlabs.org/patch/856861/ ("ar71xx: fix Kconfig dependency
of the 88E6063 switch DSA driver")
Gabor Juhos (3):
ar71xx/mikrotik: disable unused ethernet switch and phy drivers
ar71xx/mikrotik: disable unused MTD partitioning and split drivers
ar71xx/mikrotik: disable TP-Link TL-WR810N v2 board support
target/linux/ar71xx/mikrotik/config-default | 11 +++
1 file changed, 11 insertions(+)
--
2.14.3
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Merged: ar71xx: fix Kconfig dependency of the 88E6063 switch DSAdriver
Merged into my staging tree with http://git.openwrt.org/?p=openwrt/staging/jow.git;a=commitdiff;h=b21a7e5349. Thank you! ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Merged: ar71xx: sort kernel configurations
Merged into my staging tree with http://git.openwrt.org/?p=openwrt/staging/jow.git;a=commitdiff;h=f9ae253c3e. Thank you! ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Merged: ar71xx/mikrotik: disable unused MTD partitioning and splitdrivers
Merged into my staging tree with http://git.openwrt.org/?p=openwrt/staging/jow.git;a=commitdiff;h=e7d9da323f. Thank you! ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Merged: ar71xx/mikrotik: disable unused ethernet switch and phy drivers
Merged into my staging tree with http://git.openwrt.org/?p=openwrt/staging/jow.git;a=commitdiff;h=eed9614af2. Thank you! ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] Merged: ar71xx/mikrotik: disable TP-Link TL-WR810N v2 board support
Merged into my staging tree with http://git.openwrt.org/?p=openwrt/staging/jow.git;a=commitdiff;h=bb22c988ce. Thank you! ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
