Re: [LEDE-DEV] [PATCH] scripts/getver.sh: append short git hash based on upstream commit
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.
To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
There is a problem though in semantics. Assuming your suggestion is accepted,
when you build the version on your tree with dirty commits, you will see a hash
which is not corresponding to the tree you have, but the remote one. This won't
make sense.
Signed-off-by: Morteza Milani
On Sun, Jan 15, 2017 at 1:04 AM, Magnus Kroken wrote:
> The short git hash suffix printed by getver.sh is taken from the
> latest local commit, change this to use the hash from latest
> upstream commit if available. This is considered the intended
> behavior based on commit message a642a11faca87e2a7bddc1fadb54253e2fc26e84,
> introducing getver.sh.
>
> Signed-off-by: Magnus Kroken
> ---
> The referenced commit message says:
> The new output format will look like "r2400+2-882472e" for dirty trees or like
> "r2402-882472e" for clean ones.
>
> Since the example hashes are the same, I take this to mean that this was the
> intended behavior.
>
> Intended or not, I would suggest this anyway. If someone provides a LEDE
> version number from a dirty tree,
> e.g. r2961+8-abcdef01, you need access to a LEDE Git tree and ability to run
> getver.sh to look up which
> commit r2961 corresponds to. The short hash (abcdef01) is from the dirty
> tree, and can be anything that person has committed.
> Appending the upstream base commit hash is useful when people ask for help
> and you want to track down the
> commit they're based on, and you may not have a running LEDE build
> environment available. Knowing that a tree
> is dirty (+8) is useful as well, but the commit hash is only useful to people
> who have access to the dirty tree.
>
> scripts/getver.sh | 7 ++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/getver.sh b/scripts/getver.sh
> index ecf048f..4d594d3 100755
> --- a/scripts/getver.sh
> +++ b/scripts/getver.sh
> @@ -40,7 +40,12 @@ try_git() {
> REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))"
> fi
>
> - REV="${REV:+r$REV-$(git log --format="%h" -1)}"
> + if [ -n "$UPSTREAM_BASE" ]; then
> + REV="${REV:+r$REV-$(git log -n 1 --format="%h"
> $UPSTREAM_BASE)}"
> + else
> + REV="${REV:+r$REV-$(git log --format="%h" -1)}"
> + fi
> +
> ;;
> esac
>
> --
> 2.1.4
>
>
> ___
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
--- End Message ---
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] kernel: bump to 4.4.43
Refreshed patches for all supported targets.
Compiled & tested on imx6
Signed-off-by: Koen Vandeputte
---
include/kernel-version.mk| 4 ++--
.../ar71xx/patches-4.4/910-unaligned_access_hacks.patch | 4 ++--
.../0111-mm-Remove-the-PFN-busy-warning.patch| 2 +-
.../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +-
.../110-serial-imx-repair-and-complete-handshaking.patch | 16 ++--
.../patches-4.4/111-serial-imx-fix-polarity-of-RI.patch | 7 +--
...l-imx-let-irq-handler-return-IRQ_NONE-if-no-eve.patch | 9 ++---
...erial-imx-make-sure-unhandled-irqs-are-disabled.patch | 7 +--
8 files changed, 20 insertions(+), 39 deletions(-)
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index efd58e1..7cfdbd3 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,10 +3,10 @@
LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .43
-LINUX_VERSION-4.4 = .42
+LINUX_VERSION-4.4 = .43
LINUX_KERNEL_HASH-3.18.43 =
1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c
-LINUX_KERNEL_HASH-4.4.42 =
324747568e92f203e3ee5ec8b291a868f58b870f1ad214fa64aa3507ed42e878
+LINUX_KERNEL_HASH-4.4.43 =
0b1370c61a8e210f92b85476c619a1f8b9c037e0d10581a35d55f1697f84f7fb
ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
index 21cad91..2c01442 100644
--- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
@@ -491,7 +491,7 @@
memcpy(p, foc->val, foc->len);
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
-@@ -500,7 +500,7 @@ static struct sk_buff *add_grec(struct s
+@@ -505,7 +505,7 @@ static struct sk_buff *add_grec(struct s
if (!skb)
return NULL;
psrc = (__be32 *)skb_put(skb, sizeof(__be32));
@@ -610,7 +610,7 @@
goto next_ht;
--- a/net/ipv6/ip6_offload.c
+++ b/net/ipv6/ip6_offload.c
-@@ -221,7 +221,7 @@ static struct sk_buff **ipv6_gro_receive
+@@ -222,7 +222,7 @@ static struct sk_buff **ipv6_gro_receive
continue;
iph2 = (struct ipv6hdr *)(p->data + off);
diff --git
a/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch
b/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch
index f643ec8..a060280 100644
---
a/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch
+++
b/target/linux/brcm2708/patches-4.4/0111-mm-Remove-the-PFN-busy-warning.patch
@@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -6782,8 +6782,6 @@ int alloc_contig_range(unsigned long sta
+@@ -6785,8 +6785,6 @@ int alloc_contig_range(unsigned long sta
/* Make sure the range is really isolated. */
if (test_pages_isolated(outer_start, end, false)) {
diff --git
a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 698d394..eff8e82 100644
---
a/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++
b/target/linux/generic/patches-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -4222,6 +4222,9 @@ static enum gro_result dev_gro_receive(s
+@@ -4224,6 +4224,9 @@ static enum gro_result dev_gro_receive(s
enum gro_result ret;
int grow;
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau
if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
-@@ -5381,6 +5384,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5383,6 +5386,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *private)
-@@ -5452,6 +5497,7 @@ static int __netdev_upper_dev_link(struc
+@@ -5454,6 +5499,7 @@ static int __netdev_upper_dev_link(struc
goto rollback_lower_mesh;
}
@@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
return 0;
-@@ -5578,6 +5624,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -5580,6 +5626,7 @@ void netdev_upper_dev_unlink(struct net_
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev, i->
[LEDE-DEV] Syslog-ng Makefile typo
Hello. I found typo in syslog-ng makefile. I've upgraded to the newest version and I've made correction of the typo. Patch bellow. Sorry for bad format of everything. I did it never :) --- Makefile-orig 2017-01-16 12:06:44.367684776 +0100 +++ Makefile~ 2017-01-16 12:22:47.198478933 +0100 @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syslog-ng -PKG_VERSION:=3.8.1 -PKG_RELEASE:=3 +PKG_VERSION:=3.9.1 +PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ -PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af +PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a PKG_INSTALL:=1 @@ -41,7 +41,7 @@ CONFIGURE_ARGS += \ $(call autoconf_bool,CONFIG_IPV6,ipv6) \ --disable-dependency-tracking \ - --disable-ampq \ + --disable-amqp \ --disable-tcp-wrapper \ --disable-glibtest \ --disable-mongodb \ ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2 09/14] rt2x00: rt2x00pci: set PCI MWI only if supported
Hi!
On Mon, Jan 16, 2017 at 11:08:57AM +0100, Stanislaw Gruszka wrote:
> On Mon, Jan 16, 2017 at 04:06:25AM +0100, Daniel Golle wrote:
> > From: Claudio Mignanti
> >
> > This is needed for devices without support for PCI MWI. See also
> > https://dev.openwrt.org/changeset/21850
> >
> > Signed-off-by: Daniel Golle
> > ---
> > drivers/net/wireless/ralink/rt2x00/rt2x00pci.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
> > b/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
> > index eb6dbcd4fddf..4becfeb75ba8 100644
> > --- a/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
> > +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
> > @@ -94,8 +94,10 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const
> > struct rt2x00_ops *ops)
> >
> > pci_set_master(pci_dev);
> >
> > +#ifdef CONFIG_PCI_SET_MWI
> > if (pci_set_mwi(pci_dev))
> > rt2x00_probe_err("MWI not available\n");
> > +#endif
>
> There is no CONFIG_PCI_SET_MWI in the kernel. This patch is either not
> needed (pci subsystem has own PCI_DISABLE_MWI define) or wrong (we
> should not call this function for some devices).
Is anyone with good long-term memory able to tell why this was needed
in first place? Can we assume it to be obsolete when using modern
kernels?
Cheers
Daniel
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] mbedtls: add static files in staging_dir
Hi Luka, no objection but you could you provide some brief explanation on why this is needed? ~ Jo ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] ubox: turn logd into a separate package
On 01/15/2017 08:27 PM, Luka Perkov wrote:
> From: Andrej Vlasic
>
> Currently system log is always included as a part of ubox. Add logd as a
> seperate package and add it to default packages list.
>
> Signed-off-by: Andrej Vlasic
> Signed-off-by: Luka Perkov
Acked-by: Jo-Philipp Wich
> ---
> include/target.mk| 2 +-
> package/system/ubox/Makefile | 16 ++--
> 2 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/include/target.mk b/include/target.mk
> index a8d3b2b249..bca4af4b1b 100644
> --- a/include/target.mk
> +++ b/include/target.mk
> @@ -13,7 +13,7 @@ __target_inc=1
> DEVICE_TYPE?=router
>
> # Default packages - the really basic set
> -DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg
> netifd fstools uclient-fetch
> +DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg
> netifd fstools uclient-fetch logd
> # For nas targets
> DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm
> # For router targets
> diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile
> index 8900c67803..e833cac487 100644
> --- a/package/system/ubox/Makefile
> +++ b/package/system/ubox/Makefile
> @@ -5,7 +5,7 @@ PKG_RELEASE:=1
>
> PKG_SOURCE_PROTO:=git
> PKG_SOURCE_URL=$(LEDE_GIT)/project/ubox.git
> -PKG_SOURCE_DATE:=2016-09-26
> +PKG_SOURCE_DATE:=2017-01-15
> PKG_SOURCE_VERSION:=5649c028c426060616e2bd4e7ea83271cd333d21
>
> PKG_MIRROR_HASH:=ae77504a4397f92173a7646fa3555e5b51abd7ff1dd1c419770223359e41937a
> CMAKE_INSTALL:=1
> @@ -27,8 +27,15 @@ define Package/ubox
>TITLE:=OpenWrt system helper toolbox
> endef
>
> +define Package/logd
> +SECTION:=base
> + CATEGORY:=Base system
> + DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt
> + TITLE:=OpenWrt system log implementation
> +endef
> +
> define Package/ubox/install
> - $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin
> $(1)/etc/init.d
> + $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib $(1)/usr/bin
>
> $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data}
> $(1)/sbin/
> $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/getrandom $(1)/usr/bin/
> @@ -39,9 +46,14 @@ define Package/ubox/install
> $(LN) ../../sbin/kmodloader $(1)/usr/sbin/lsmod
> $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modinfo
> $(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe
> +endef
> +
> +define Package/logd/install
> + $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/
>
> $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
> $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
> endef
>
> $(eval $(call BuildPackage,ubox))
> +$(eval $(call BuildPackage,logd))
>
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2 09/14] rt2x00: rt2x00pci: set PCI MWI only if supported
On 16/01/2017 12:42, Daniel Golle wrote:
> Hi!
>
> On Mon, Jan 16, 2017 at 11:08:57AM +0100, Stanislaw Gruszka wrote:
>> On Mon, Jan 16, 2017 at 04:06:25AM +0100, Daniel Golle wrote:
>>> From: Claudio Mignanti
>>>
>>> This is needed for devices without support for PCI MWI. See also
>>> https://dev.openwrt.org/changeset/21850
>>>
>>> Signed-off-by: Daniel Golle
>>> ---
>>> drivers/net/wireless/ralink/rt2x00/rt2x00pci.c | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
>>> b/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
>>> index eb6dbcd4fddf..4becfeb75ba8 100644
>>> --- a/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
>>> +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00pci.c
>>> @@ -94,8 +94,10 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const
>>> struct rt2x00_ops *ops)
>>>
>>> pci_set_master(pci_dev);
>>>
>>> +#ifdef CONFIG_PCI_SET_MWI
>>> if (pci_set_mwi(pci_dev))
>>> rt2x00_probe_err("MWI not available\n");
>>> +#endif
>>
>> There is no CONFIG_PCI_SET_MWI in the kernel. This patch is either not
>> needed (pci subsystem has own PCI_DISABLE_MWI define) or wrong (we
>> should not call this function for some devices).
>
> Is anyone with good long-term memory able to tell why this was needed
> in first place? Can we assume it to be obsolete when using modern
> kernels?
>
>
> Cheers
>
>
> Daniel
>
this was related to rt61 a few years ago. i'll dive into my mail archive
later today to see if i can figure out why,
John
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH v2 1/2] busybox: convert netmsg and lock applet to "new style" applet definition
Look ok. Tested on imx6 http://pastebin.com/raw/x1zs4trr Tested-by: Koen Vandeputte On 2017-01-15 02:21, Magnus Kroken wrote: The "new style" busybox applet approach moves all config and build definitions related to an applet to its .c file. This makes the patches easier to maintain, as they only add new files to the busybox build directory, without modifying BusyBox files. Signed-off-by: Magnus Kroken --- v2: Merge netmsg and lock changes to one patch, as the changes are closely related. .../busybox/patches/210-add_netmsg_util.patch | 54 ++ .../utils/busybox/patches/220-add_lock_util.patch | 54 ++ 2 files changed, 30 insertions(+), 78 deletions(-) diff --git a/package/utils/busybox/patches/210-add_netmsg_util.patch b/package/utils/busybox/patches/210-add_netmsg_util.patch index 2382698..d7b2ae7 100644 --- a/package/utils/busybox/patches/210-add_netmsg_util.patch +++ b/package/utils/busybox/patches/210-add_netmsg_util.patch @@ -1,46 +1,25 @@ a/include/applets.src.h -+++ b/include/applets.src.h -@@ -229,6 +229,7 @@ IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DRO - IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP)) - IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP)) - IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP)) -+IF_NETMSG(APPLET(netmsg, BB_DIR_BIN, BB_SUID_REQUIRE)) - IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP)) - IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP)) - IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP)) a/networking/Config.src -+++ b/networking/Config.src -@@ -639,6 +639,12 @@ config FEATURE_IPCALC_LONG_OPTIONS - help - Support long options for the ipcalc applet. - -+config NETMSG -+ bool "netmsg" -+ default n -+ help -+simple program for sending udp broadcast messages -+ - config NETSTAT - bool "netstat" - default y a/networking/Kbuild.src -+++ b/networking/Kbuild.src -@@ -27,6 +27,7 @@ lib-$(CONFIG_IP) += ip.o - lib-$(CONFIG_IPCALC) += ipcalc.o - lib-$(CONFIG_NAMEIF) += nameif.o - lib-$(CONFIG_NC) += nc.o -+lib-$(CONFIG_NETMSG) += netmsg.o - lib-$(CONFIG_NETSTAT) += netstat.o - lib-$(CONFIG_NSLOOKUP) += nslookup.o - lib-$(CONFIG_NTPD) += ntpd.o --- /dev/null +++ b/networking/netmsg.c -@@ -0,0 +1,65 @@ +@@ -0,0 +1,76 @@ +/* + * Copyright (C) 2006 Felix Fietkau + * + * This is free software, licensed under the GNU General Public License v2. + */ ++ ++//config:config NETMSG ++//config: bool "netmsg" ++//config: default n ++//config: help ++//config: simple program for sending udp broadcast messages ++ ++//applet:IF_NETMSG(APPLET(netmsg, BB_DIR_BIN, BB_SUID_REQUIRE)) ++ ++//kbuild:lib-$(CONFIG_NETMSG) += netmsg.o ++ ++//usage:#define netmsg_trivial_usage NOUSAGE_STR ++//usage:#define netmsg_full_usage "" ++ +#include +#include +#include @@ -50,9 +29,6 @@ +#include +#include "busybox.h" + -+//usage:#define netmsg_trivial_usage NOUSAGE_STR -+//usage:#define netmsg_full_usage "" -+ +#ifndef CONFIG_NETMSG +int main(int argc, char **argv) +#else diff --git a/package/utils/busybox/patches/220-add_lock_util.patch b/package/utils/busybox/patches/220-add_lock_util.patch index c60f5db..4e46b74 100644 --- a/package/utils/busybox/patches/220-add_lock_util.patch +++ b/package/utils/busybox/patches/220-add_lock_util.patch @@ -1,46 +1,25 @@ a/include/applets.src.h -+++ b/include/applets.src.h -@@ -196,6 +196,7 @@ IF_LN(APPLET_NOEXEC(ln, ln, BB_DIR_BIN, - IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP)) - IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP)) - IF_LOADKMAP(APPLET(loadkmap, BB_DIR_SBIN, BB_SUID_DROP)) -+IF_LOCK(APPLET(lock, BB_DIR_BIN, BB_SUID_DROP)) - IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname)) - IF_LOSETUP(APPLET(losetup, BB_DIR_SBIN, BB_SUID_DROP)) - IF_LS(APPLET_NOEXEC(ls, ls, BB_DIR_BIN, BB_SUID_DROP, ls)) a/miscutils/Config.src -+++ b/miscutils/Config.src -@@ -375,6 +375,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA - help - Enables the 'hdparm -d' option to get/set using_dma flag. - -+config LOCK -+ bool "lock" -+ default n -+ help -+Small utility for using locks in scripts -+ - config MAKEDEVS - bool "makedevs" - default y a/miscutils/Kbuild.src -+++ b/miscutils/Kbuild.src -@@ -33,6 +33,7 @@ lib-$(CONFIG_LAST)+= last.o - endif - - lib-$(CONFIG_LESS)+= less.o -+lib-$(CONFIG_LOCK)+= lock.o - lib-$(CONFIG_MAKEDEVS)+= makedevs.o - lib-$(CONFIG_MAN) += man.o - lib-$(CONFIG_MICROCOM)+= microcom.o --- /dev/null +++ b/miscutils/lock.c -@@ -0,0 +1,144 @@ +@@ -0,0 +1,155 @@ +/* + * Copyright (C) 2006 Felix Fietkau + * + * This is free software, licensed under the GNU General Public License v2. + */ ++ ++//config:config LOCK ++//config: bool "lock" ++//config: default n ++//c
Re: [LEDE-DEV] [PATCH] mbedtls: add static files in staging_dir
Hi Jo, On Mon, Jan 16, 2017 at 01:02:26PM +0100, Jo-Philipp Wich wrote: > no objection but you could you provide some brief explanation on why > this is needed? This is needed only if one wishes to statically link with mbedtls even though that at the moment no package is using this. Luka ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] LEDE 17.01 branched
Hi list, this is just a heads-up to inform you that LEDE master has been branched into a new branch "lede-17.01" now. A buildbot system has been set up at http://release-builds.lede-project.org/17.01/images which will begin building images and SDKs shortly. Once the base phase1 builds for each architecture have been finished within the next two to three days, we will start building the package repositories for the release branch. The next 7 days shall be used to work on finalizing the "lede-17.01" branch and to cherry-pick important outstanding fixes from master. The plan is to have test builds available until next Monday, the 23th and to follow up with the final release decision on the same day. If all goes well, there will be a one week testing period following the 23th until the 30th. If no major issues are found, LEDE v17.01.0 can then be tagged on Monday, the 30th and final builds shall be available shortly after. If serious issues arise during the first testing period, we might decide to extended by the test phase by a further week until a resolution is found. If targets or specific images cannot be fixed in time, we should consider dropping them from the initial release and aim for adding/fixing them in the next LEDE v17.01.1 point release. Thanks, Jo ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] PHP at build time
Hi. I’m working on a project (some GUI interfaces and a back end for generating traffic shaping using netfilter/tc) written in PHP7. It uses PHP’s “composer”. I could install composer (it’s only ever run once on a released project) on the target machine, and run it on first boot. But that seems like a waste of space, and if there are any packaging problems, I’d rather detect them early on at build time. But that requires having PHP in the build environment at build time. Which is the lessor of the two evils? And do we go with the OS distribution of PHP7 (assuming it’s available… and it’s not on Ubuntu 14.04 LTS)? Or build a staging version of? What are the currently “blessed” list of OSes and releases to build on, anyway? I thought I had seen a list somewhere a while ago calling out Ubuntu 14.04 and 16.04 LTS, but couldn’t find it again when I went looking for it. One last and unrelated question: I tried to build a package (syslog-ng) in parallel mode on a 12-core system, and it built fine. But I understand that parallel build conditions are sometimes hard to reproduce. How does one adequately prove that a package is parallel-build safe? Thanks, -Philip ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Syslog-ng Makefile typo
Looks good to me. > On Jan 16, 2017, at 4:24 AM, Milan Kočvara wrote: > > Hello. > I found typo in syslog-ng makefile. > > I've upgraded to the newest version and I've made correction of the typo. > Patch bellow. > > Sorry for bad format of everything. I did it never :) > > --- Makefile-orig 2017-01-16 12:06:44.367684776 +0100 > +++ Makefile~ 2017-01-16 12:22:47.198478933 +0100 > @@ -1,14 +1,14 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=syslog-ng > -PKG_VERSION:=3.8.1 > -PKG_RELEASE:=3 > +PKG_VERSION:=3.9.1 > +PKG_RELEASE:=1 > > PKG_MAINTAINER:=W. Michael Petullo > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz > PKG_SOURCE_URL:=https://github.com/balabit/syslog-ng/releases/download/$(PKG_NAME)-$(PKG_VERSION)/ > -PKG_MD5SUM:=acf14563cf5ce435db8db35486ce66af > +PKG_MD5SUM:=1b48da9ef620cf06e55e481b5abb677a > > PKG_INSTALL:=1 > > @@ -41,7 +41,7 @@ > CONFIGURE_ARGS += \ > $(call autoconf_bool,CONFIG_IPV6,ipv6) \ > --disable-dependency-tracking \ > - --disable-ampq \ > + --disable-amqp \ > --disable-tcp-wrapper \ > --disable-glibtest \ > --disable-mongodb \ ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [PATCH] cns3xxx: restore mpcore watchdog
On Tue, Jan 10, 2017 at 5:34 AM, Koen Vandeputte wrote: > Adds the mpcore watchdog driver for kernel 4.4 as it was originally > present up to kernel 3.12 > > - Disabled by default for now, but can be simply enabled in kernelconfig > - Currently does not contain the latest patches as mentioned here: Koen, Thanks for submitting this - I agree with Felix that we should add back the functionality if possible. The issue mentioned in the commit which removed the driver from mainline linux [1] regarding 'Nothing ensures the userspace ioctl() will end-up kicking the watchdog on the right CPU.' is addressed by the fact that the watchdog register base defined in laguna.c [2] as the register 'CNS3XXX_TC11MP_TWD_BASE + 0x100' always points to the CPU0 watchdog as opposed to CNS3XXX_TC11MP_TWD_BASE which would be aliased to the watchdog of whatever CPU core the process is running. However, I found after a bit of digging I found that this mainline driver requires other patches to make the watchdog reliable which apparently never got accepted upstream [3] [4] [5] [6]. While these patches were apparently never accepted upstream they were in the OpenWrt git repo for the 3.10 kernel and below and not surprisingly got removed when the kernel bumped past 3.10. These patches also need to be re-added (at least definitely [3]) as without them you'll find that the timer count is too large and the watchdog will unexpectedly trip typically within a matter of several minutes. With these additional patches added I would say that we should also enable the watchdog in the kernel config. How do you want to proceed? I could ack your patch (as it adds the base driver back from mainline but doesn't enable it) then followup with a patch that adds back the additional patches (to target/platform/cns3xxx unless there are other targets that use the arm11mpcore processor and want the twd fixes?) and enables the watchdog kernel driver. Note that the patches affect other files so we can't simply merge them all into the files directory. Regards, Tim [1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=6e63a3a294fdf91eaaac1061a9c7a5f53d16ac25 [2] https://git.lede-project.org/?p=source.git;a=blob;f=target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c;h=4a596125ab5c8ab1b3a1d31e00d406097b2412d0;hb=HEAD#l636 [3] https://git.lede-project.org/?p=source.git;a=blob;f=target/linux/generic/target/linux/generic/target/linux/generic/patches-3.10/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch;h=ae81f3f384b5805ee64dcbadcaab38aaea1acf1e [4] https://git.lede-project.org/?p=source.git;a=blob;f=target/linux/generic/target/linux/generic/target/linux/generic/patches-3.10/target/linux/generic/patches-3.10/993-mpcore_wdt_fix_wdioc_setoptions_handling.patch;h=c986ac8f216c2a201875b44fc2fe6a8191680c13 [5] https://git.lede-project.org/?p=source.git;a=blob;f=target/linux/generic/target/linux/generic/target/linux/generic/patches-3.10/target/linux/generic/patches-3.10/994-mpcore_wdt_fix_timer_mode_setup.patch;h=ecc2452cabe058990d56052644e3d328e549df01 [6] https://git.lede-project.org/?p=source.git;a=blob;f=target/linux/generic/target/linux/generic/target/linux/generic/patches-3.10/target/linux/generic/patches-3.10/995-mpcore_twd_calibrate_single_core.patch;h=70411160fac88aeae42a2696039ab9bb5e9f47ba ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] openvpn: add support for various new 2.4 configuration options
Updates to openvpn.init were included in early OpenVPN 2.4 patch
series, but got lost along the way and were never merged.
Signed-off-by: Magnus Kroken
---
.../network/services/openvpn/files/openvpn.init| 43 ++
1 file changed, 19 insertions(+), 24 deletions(-)
diff --git a/package/network/services/openvpn/files/openvpn.init
b/package/network/services/openvpn/files/openvpn.init
index 0fcdc7e..af9c144 100644
--- a/package/network/services/openvpn/files/openvpn.init
+++ b/package/network/services/openvpn/files/openvpn.init
@@ -95,38 +95,33 @@ start_instance() {
# append flags
append_bools "$s" \
- auth_nocache auth_user_pass_optional bind ccd_exclusive client
client_cert_not_required \
- client_to_client comp_noadapt disable \
- disable_occ down_pre duplicate_cn fast_io float
http_proxy_retry \
+ allow_recursive_routing auth_nocache auth_user_pass_optional
bind ccd_exclusive client client_cert_not_required \
+ client_to_client comp_noadapt disable disable_occ down_pre
duplicate_cn fast_io float http_proxy_retry \
ifconfig_noexec ifconfig_nowarn ifconfig_pool_linear
management_forget_disconnect management_hold \
management_query_passwords management_signal mktun mlock
mtu_test multihome mute_replay_warnings \
- nobind no_iv no_name_remapping no_replay opt_verify passtos
persist_key persist_local_ip \
- persist_remote_ip persist_tun ping_timer_rem pull push_reset \
- remote_random rmtun route_noexec route_nopull single_session
socks_proxy_retry \
- suppress_timestamps tcp_nodelay test_crypto tls_client tls_exit
tls_server \
+ ncp_disable nobind no_iv no_name_remapping no_replay opt_verify
passtos persist_key persist_local_ip \
+ persist_remote_ip persist_tun ping_timer_rem pull push_reset
remote_random rmtun route_noexec route_nopull \
+ single_session socks_proxy_retry suppress_timestamps
tcp_nodelay test_crypto tls_client tls_exit tls_server \
tun_ipv6 up_delay up_restart username_as_common_name
# append params
append_params "$s" \
cd askpass auth auth_retry auth_user_pass auth_user_pass_verify
bcast_buffers ca cert capath \
- chroot cipher client_config_dir client_connect
client_disconnect comp_lzo connect_freq \
+ chroot cipher client_config_dir client_connect
client_disconnect comp_lzo compress connect_freq \
connect_retry connect_timeout connect_retry_max crl_verify dev
dev_node dev_type dh \
- echo engine explicit_exit_notify fragment group hand_window
hash_size \
- http_proxy http_proxy_option http_proxy_timeout ifconfig
ifconfig_pool \
- ifconfig_pool_persist ifconfig_push inactive ipchange iroute
keepalive \
- key key_method keysize learn_address link_mtu lladdr local log
log_append \
- lport management management_log_cache max_clients \
- max_routes_per_client mode mssfix mtu_disc mute nice
ns_cert_type ping \
- ping_exit ping_restart pkcs12 plugin port port_share prng proto
rcvbuf \
- redirect_gateway remap_usr1 remote remote_cert_eku
remote_cert_ku remote_cert_tls \
- reneg_bytes reneg_pkts reneg_sec \
- replay_persist replay_window resolv_retry route route_delay
route_gateway \
- route_metric route_pre_down route_up rport script_security
secret server server_bridge setenv shaper sndbuf \
- socks_proxy status status_version syslog tcp_queue_limit
tls_auth tls_version_min \
- tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology
tran_window \
- tun_mtu tun_mtu_extra txqueuelen user verb down push up \
- verify_x509_name x509_username_field \
- ifconfig_ipv6 route_ipv6 server_ipv6 ifconfig_ipv6_pool
ifconfig_ipv6_push iroute_ipv6
+ ecdh_curve echo engine explicit_exit_notify fragment group
hand_window hash_size http_proxy \
+ http_proxy_option http_proxy_timeout ifconfig ifconfig_pool
ifconfig_pool_persist ifconfig_push \
+ inactive ipchange iroute keepalive key key_method keysize
learn_address link_mtu lladdr local \
+ log log_append lport management management_log_cache
max_clients max_routes_per_client mode \
+ mssfix mtu_disc mute ncp_ciphers nice ns_cert_type ping
ping_exit ping_restart pkcs12 plugin \
+ port port_share prng proto pull_filter rcvbuf redirect_gateway
remap_usr1 remote remote_cert_eku \
+ remote_cert_ku remote_cert_tls reneg_bytes reneg_pkts reneg_sec
replay_persist replay_window \
+ resolv_retry route route_delay route_gateway route_metric
route_pre_down route_up rport \
[LEDE-DEV] ubus network restart issue?
All,
I've seen a pretty easy to reproduce ubus issue related to network
restart. I've tested this on various releases include the recently
release LEDE branch as well as OpenWrt CC. I've also tested on more
than one target and with various delays including as long as 2
minutes.
Before:
root@lede:/# ubus list
dhcp
file
iwinfo
log
network
network.device
network.interface
network.interface.lan
network.interface.loopback
network.interface.wan
network.interface.wan6
network.wireless
service
session
system
uci
root@lede:/# while true; do ubus call network restart; sleep 10; ubus list | gre
p network || { echo network failed; ubus list; break; }; done
[ snip - always about 6-7 iterations of the while loop ]
network failed
dhcp
file
iwinfo
log
service
session
system
uci
The end result is that we're unable to make ubus calls to all the
missing objects and we're stuck in this state getting an 'Object not
found' message if we try to operate on the missing items. Running
/etc/init.d/network restart will recover from this state.
Any one have ideas? Any ideas on where to start?
-M
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] bluez 5.38 bluetoothd and/or bluetoothctl not working
Anyone using bluez on LEDE/OpenWrt that could tell me what could be
wrong with the following?
I'm using the following:
- imx6 based board with 4.4 kernel
- CSR 4.0 USB HCI supported by btusb via kmod-bluetooth package
- lede master
- btusb
- bluez-{daemon,examples,libs,utils} 5.38-1 from packages feed
root@lede:/# bluetoothctl
[bluetooth]# [ 45.980509] usb 1-1.4: new full-speed USB device
number 3 using ci_hdrc
[NEW] Controller 00:15:83:6B:E2:BD BlueZ 5.38 [default]
[bluetooth]# list
Controller 00:15:83:6B:E2:BD BlueZ 5.38 [default]
[bluetooth]# show 00:15:83:6B:E2:BD
Controller 00:15:83:6B:E2:BD
Name: BlueZ 5.38
Alias: BlueZ 5.38
Class: 0x00
Powered: no
Discoverable: no
Pairable: yes
UUID: Generic Attribute Profile (1801--1000-8000-00805f9b34fb)
UUID: A/V Remote Control(110e--1000-8000-00805f9b34fb)
UUID: PnP Information (1200--1000-8000-00805f9b34fb)
UUID: Generic Access Profile(1800--1000-8000-00805f9b34fb)
UUID: A/V Remote Control Target (110c--1000-8000-00805f9b34fb)
Modalias: usb:v1D6Bp0246d0526
Discovering: no
[bluetooth]# select 00:15:83:6B:E2:BD
[bluetooth]# show 00:15:83:6B:E2:BD
Controller 00:15:83:6B:E2:BD
Name: BlueZ 5.38
Alias: BlueZ 5.38
Class: 0x00
Powered: no
Discoverable: no
Pairable: yes
UUID: Generic Attribute Profile (1801--1000-8000-00805f9b34fb)
UUID: A/V Remote Control(110e--1000-8000-00805f9b34fb)
UUID: PnP Information (1200--1000-8000-00805f9b34fb)
UUID: Generic Access Profile(1800--1000-8000-00805f9b34fb)
UUID: A/V Remote Control Target (110c--1000-8000-00805f9b34fb)
Modalias: usb:v1D6Bp0246d0526
Discovering: no
[bluetooth]# power on
Failed to set power on: org.freedesktop.DBus.Error.AccessDenied
[bluetooth]# show 00:15:83:6B:E2:BD
Controller 00:15:83:6B:E2:BD
Name: BlueZ 5.38
Alias: BlueZ 5.38
Class: 0x00
Powered: no
Discoverable: no
Pairable: yes
UUID: Generic Attribute Profile (1801--1000-8000-00805f9b34fb)
UUID: A/V Remote Control(110e--1000-8000-00805f9b34fb)
UUID: PnP Information (1200--1000-8000-00805f9b34fb)
UUID: Generic Access Profile(1800--1000-8000-00805f9b34fb)
UUID: A/V Remote Control Target (110c--1000-8000-00805f9b34fb)
Modalias: usb:v1D6Bp0246d0526
Discovering: no
[bluetooth]# scan on
Failed to start discovery: org.freedesktop.DBus.Error.AccessDenied
I can enable and scan devices using 'hciconfig hci0 up; hcitool scan'.
regards,
Tim
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
