[LEDE-DEV] [PATCH] firmware-utils: mktplinkfw: rework combined image option

2017-07-09 Thread Piotr Dymacz
We use combined option in "mktplinkfw" tool for generating initramfs kernel images and header for kernel inside "safeloader" image type (in fact, only for TL-WR1043ND v4 at this moment). There is also "mktplinkfw-kernel" tool, a stripped-down version, used only for generating "simple" header, for

Re: [LEDE-DEV] [PATCH] uhttpd: fix PKG_BUILD_DEPENDS

2017-07-09 Thread Matthias Schiffer
On 06/22/2017 02:07 AM, Daniel Golle wrote: > uhttpd refered to ustream-ssl as PKG_BUILD_DEPENDS. While this > intuitively seems like the correct thing to do, it turns out not to > have the desired effect: PKG_BUILD_DEPENDS needs to list the resulting > package name (ie. one of libustream-*) and no

Re: [LEDE-DEV] [PATCH] firmware-utils: mktplinkfw: rework combined image option

2017-07-09 Thread Matthias Schiffer
On 07/10/2017 01:02 AM, Piotr Dymacz wrote: > We use combined option in "mktplinkfw" tool for generating initramfs > kernel images and header for kernel inside "safeloader" image type (in > fact, only for TL-WR1043ND v4 at this moment). > > There is also "mktplinkfw-kernel" tool, a stripped-down v

[LEDE-DEV] [PATCH 3/4] scripts/getver.sh: include branch name in revision string

2017-07-09 Thread Matthias Schiffer
To determine the originating branch of a commit, a file called "branch" must be added to the root of the repository (similar to the existing "version" file used to override the getver.sh logic). When no such file exists in the commit in question, the master branch is assumed. Signed-off-by: Matthi

[LEDE-DEV] [PATCH 1/4] scripts/getver.sh: fail when an invalid commit reference is given

2017-07-09 Thread Matthias Schiffer
Correctly return "unknown" instead of printing various error messages, followed by a "r0-..." revision. Signed-off-by: Matthias Schiffer --- scripts/getver.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/getver.sh b/scripts/getver.sh index 9175f411db..1032fa324e 100755 --- a/scr

[LEDE-DEV] [PATCH 4/4] scripts/getver.sh: only consider version override file when no argument is given

2017-07-09 Thread Matthias Schiffer
Signed-off-by: Matthias Schiffer --- scripts/getver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/getver.sh b/scripts/getver.sh index f6d18bb3a3..30cf32ed14 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -10,7 +10,7 @@ get_branch() { } try_version()

[LEDE-DEV] [PATCH 2/4] scripts/getver.sh: drop try_hg

2017-07-09 Thread Matthias Schiffer
We don't use Mercurial, try_hg didn't understand GET_REV, and its output didn't have anything to do with the way LEDE counts revisions. Signed-off-by: Matthias Schiffer --- scripts/getver.sh | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/getver.sh b/scripts/g

Re: [LEDE-DEV] [PATCH] firmware-utils: mktplinkfw: rework combined image option

2017-07-09 Thread Piotr Dymacz
Hello Matthias, On 10.07.2017 01:27, Matthias Schiffer wrote: On 07/10/2017 01:02 AM, Piotr Dymacz wrote: We use combined option in "mktplinkfw" tool for generating initramfs kernel images and header for kernel inside "safeloader" image type (in fact, only for TL-WR1043ND v4 at this moment). T