| Message ID | 20190616113925.3434-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Rejected |
| Headers | show |
diff --git a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch index 1ab8987b..0858aff2 100644 --- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch +++ b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch @@ -1,11 +1,6 @@ -From e4ad344db97df356e178963cad6e517e2df92709 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer <tim@tn-x.org> Date: Sat, 8 Jul 2017 10:46:59 +0200 -Subject: [PATCH 1/4] sysupgrade no config save - ---- - package/base-files/files/sbin/sysupgrade | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Subject: sysupgrade no config save diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade index b75bd097f3..ddcfcd74e4 100755 diff --git a/build_patches/openwrt/0002-set-root-password.patch b/build_patches/openwrt/0002-set-root-password.patch index 5defc8fc..af587474 100644 --- a/build_patches/openwrt/0002-set-root-password.patch +++ b/build_patches/openwrt/0002-set-root-password.patch @@ -1,11 +1,6 @@ -From 6782f72e0666bc1121df061ec2ca34c1035faf86 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer <tim@tn-x.org> Date: Sat, 8 Jul 2017 10:47:28 +0200 -Subject: [PATCH 2/4] set root password - ---- - package/base-files/files/etc/shadow | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Subject: set root password diff --git a/package/base-files/files/etc/shadow b/package/base-files/files/etc/shadow index 4b4154f21f..b8d180a956 100644 diff --git a/build_patches/openwrt/0003-ntpd-host-as-string.patch b/build_patches/openwrt/0003-ntpd-host-as-string.patch index 0fb14c7b..26c541da 100644 --- a/build_patches/openwrt/0003-ntpd-host-as-string.patch +++ b/build_patches/openwrt/0003-ntpd-host-as-string.patch @@ -1,11 +1,6 @@ -From 380f33fde8bfb4e35eae7e5073ca2d0fd8270abf Mon Sep 17 00:00:00 2001 From: Tim Niemeyer <tim@tn-x.org> Date: Sat, 8 Jul 2017 10:47:56 +0200 -Subject: [PATCH 3/4] ntpd host as string - ---- - package/utils/busybox/files/sysntpd | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) +Subject: ntpd host as string diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd index e693e4031c..12383a4937 100755 diff --git a/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch b/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch index 8aae6d02..a3858199 100644 --- a/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch +++ b/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch @@ -1,12 +1,6 @@ -From 924934df6ca9696888f1b520560c8bc4df1d59eb Mon Sep 17 00:00:00 2001 From: Tim Niemeyer <tim@tn-x.org> Date: Sat, 8 Jul 2017 10:48:53 +0200 -Subject: [PATCH 4/4] ar71xx-4.9-l2tp-stats - ---- - ...-stats-counter-overflow-on-32-bit-systems.patch | 38 ++++++++++++++++++++++ - 1 file changed, 38 insertions(+) - create mode 100644 target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch +Subject: ar71xx-4.9-l2tp-stats diff --git a/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch b/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit-systems.patch new file mode 100644 diff --git a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch index 53e7a6f3..7e24ed19 100644 --- a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch +++ b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch @@ -1,12 +1,6 @@ -From e602e72f7e67db86264c7daf70c8cf2c32913139 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer <tim@tn-x.org> Date: Mon, 6 Aug 2018 18:39:04 +0200 -Subject: [PATCH] allow building all devives as tiny - ---- - target/linux/ar71xx/image/Makefile | 5 +++++ - target/linux/ar71xx/tiny/config-default | 15 +++++++++++++++ - 2 files changed, 20 insertions(+) +Subject: allow building all devives as tiny diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 1eaf1e457c..602323bba2 100644 diff --git a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch b/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch index 941b7d73..de6aa7b8 100644 --- a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch +++ b/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch @@ -1,15 +1,11 @@ -From dc634e3bbd66089ea9d92f19983182bfdf2de13c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler <freifunk@adrianschmutzler.de> Date: Wed, 10 Oct 2018 20:05:53 +0200 -Subject: [PATCH 1/2] firmware-utils: tplink-safeloader: Add CPE210 v3 +Subject: firmware-utils: tplink-safeloader: Add CPE210 v3 Add TP-Link CPE210 v3 to the support list. It's identical to the v2. Signed-off-by: Robert Marko <robimarko@gmail.com> ---- - tools/firmware-utils/src/tplink-safeloader.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c index 4b227e1c97..01885683c3 100644 diff --git a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch b/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch index 7d6af911..8796a31f 100644 --- a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch +++ b/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch @@ -1,7 +1,6 @@ -From 2eca1d93647356939a7388847a65cb2533cc5858 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler <freifunk@adrianschmutzler.de> Date: Wed, 10 Oct 2018 20:13:09 +0200 -Subject: [PATCH 2/2] ar71xx: Add support for TP-Link CPE210 v3 +Subject: ar71xx: Add support for TP-Link CPE210 v3 Looks identical to the v2 @@ -24,15 +23,6 @@ Stock TFTP server IP:192.168.0.100 Stock device TFTP address:192.168.0.254 Signed-off-by: Robert Marko <robimarko@gmail.com> ---- - target/linux/ar71xx/base-files/etc/board.d/01_leds | 4 +++- - target/linux/ar71xx/base-files/etc/board.d/02_network | 1 + - target/linux/ar71xx/base-files/lib/ar71xx.sh | 4 ++++ - target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 3 ++- - target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c | 3 +++ - target/linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + - target/linux/ar71xx/image/generic-tp-link.mk | 7 +++++++ - 7 files changed, 21 insertions(+), 2 deletions(-) diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds index 592133ac28..89cc0cbff7 100755
Hallo Adrian, Ich favorisiere da weder die eine, noch die andere Variante. Daher würde ich es ehrlich gesagt lieber einfach nicht anfassen. Ein Patch sieht halt normalerweise einfach so aus. Ansonsten muss man ja die Zeilen jedes mal manuell löschen. Gruß Fabian
Hallo,
die Patches die wir verwenden sind halt eigentlich welche, die für Mailverkehr gedacht sind.
Da steht viel mehr drin als das patch tool braucht.
Interessant wäre allerdings, ob man git format-patch nicht so konfigurieren kann, dass es die Patches entsprechend baut. Es ist ja auch nicht Sinn der Sache, dass dann bei jeder Änderung der git Version unten die Versionsnummer geupdatet wird oder ganz oben der Quellcommit.
Bis jetzt gefunden haben in nur -p, das entfernt die File-Statistiken. Ich muss mal bei OpenWrt fragen, wie die das machen.
Grüße
Adrian
From: Fabian Bläse [mailto:fabian@blaese.de]
Sent: Donnerstag, 27. Juni 2019 20:07
To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net
Subject: Re: [PATCH 1/3] build_patches: Remove unnecessary text from patch headers
Hallo Adrian,
Ich favorisiere da weder die eine, noch die andere Variante.
Daher würde ich es ehrlich gesagt lieber einfach nicht anfassen.
Ein Patch sieht halt normalerweise einfach so aus.
Ansonsten muss man ja die Zeilen jedes mal manuell löschen.
Gruß
Fabian
Hallo,
ich habe mal nachgefragt:
git format-patch @~1 --no-stat --full-index --no-renames --binary --no-signature --format=format:'From: %an <%ae>%nDate: %aD%nSubject: %B'
(Ein paar Sachen sind nicht zwingend notwendig)
https://github.com/openwrt-routing/packages/pull/478#issuecomment-506627499
Grüße
Adrian
From: Fabian Bläse [mailto:fabian@blaese.de]
Sent: Donnerstag, 27. Juni 2019 20:07
To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net
Subject: Re: [PATCH 1/3] build_patches: Remove unnecessary text from patch headers
Hallo Adrian,
Ich favorisiere da weder die eine, noch die andere Variante.
Daher würde ich es ehrlich gesagt lieber einfach nicht anfassen.
Ein Patch sieht halt normalerweise einfach so aus.
Ansonsten muss man ja die Zeilen jedes mal manuell löschen.
Gruß
Fabian
Hmm, so richtig hübsch kann man sich das ja jetzt auch nicht merken.. ;-D Ich sehe weiterhin in keiner der beiden Varianten einen wirklichen Vorteil, daher bleibe ich dabei, dass es mir egal ist. Gruß Fabian
Hallo,
ich habe mir jetzt so einen Alias gebaut und werde zukünftige Patches so schicken.
Die alten können wir dann erstmal so lassen, die Frage stellt sich dann wieder, wenn ein Update auf 18.06.4 oder 19.07.0 gemacht wird. Aber das soll dann der entscheiden, der das Update schickt …
Grüße
Adrian
From: Fabian Bläse [mailto:fabian@blaese.de]
Sent: Montag, 1. Juli 2019 20:59
To: Adrian Schmutzler <mail@adrianschmutzler.de>; franken-dev@freifunk.net
Subject: Re: [PATCH 1/3] build_patches: Remove unnecessary text from patch headers
Hmm, so richtig hübsch kann man sich das ja jetzt auch nicht merken.. ;-D
Ich sehe weiterhin in keiner der beiden Varianten einen wirklichen Vorteil, daher bleibe ich dabei, dass es mir egal ist.
Gruß
Fabian
Rejected. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Adrian Schmutzler > Sent: Sonntag, 16. Juni 2019 13:39 > To: franken-dev@freifunk.net > Subject: [PATCH 1/3] build_patches: Remove unnecessary text from patch > headers > > Despite tidyness, this will also simplify diffs for later patch > changes. > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > build_patches/openwrt/0001-sysupgrade-no-config-save.patch | 7 +------ > build_patches/openwrt/0002-set-root-password.patch | 7 +------ > build_patches/openwrt/0003-ntpd-host-as-string.patch | 7 +------ > build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch | 8 > +------- > .../openwrt/0005-allow-building-all-devives-as-tiny.patch | 8 > +------- > ...0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch | 6 +----- > .../0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch | 12 > +----------- > 7 files changed, 7 insertions(+), 48 deletions(-) > > diff --git a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch > b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch > index 1ab8987b..0858aff2 100644 > --- a/build_patches/openwrt/0001-sysupgrade-no-config-save.patch > +++ b/build_patches/openwrt/0001-sysupgrade-no-config-save.patch > @@ -1,11 +1,6 @@ > -From e4ad344db97df356e178963cad6e517e2df92709 Mon Sep 17 00:00:00 2001 > From: Tim Niemeyer <tim@tn-x.org> > Date: Sat, 8 Jul 2017 10:46:59 +0200 > -Subject: [PATCH 1/4] sysupgrade no config save > - > ---- > - package/base-files/files/sbin/sysupgrade | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > +Subject: sysupgrade no config save > > diff --git a/package/base-files/files/sbin/sysupgrade > b/package/base-files/files/sbin/sysupgrade > index b75bd097f3..ddcfcd74e4 100755 > diff --git a/build_patches/openwrt/0002-set-root-password.patch > b/build_patches/openwrt/0002-set-root-password.patch > index 5defc8fc..af587474 100644 > --- a/build_patches/openwrt/0002-set-root-password.patch > +++ b/build_patches/openwrt/0002-set-root-password.patch > @@ -1,11 +1,6 @@ > -From 6782f72e0666bc1121df061ec2ca34c1035faf86 Mon Sep 17 00:00:00 2001 > From: Tim Niemeyer <tim@tn-x.org> > Date: Sat, 8 Jul 2017 10:47:28 +0200 > -Subject: [PATCH 2/4] set root password > - > ---- > - package/base-files/files/etc/shadow | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > +Subject: set root password > > diff --git a/package/base-files/files/etc/shadow > b/package/base-files/files/etc/shadow > index 4b4154f21f..b8d180a956 100644 > diff --git a/build_patches/openwrt/0003-ntpd-host-as-string.patch > b/build_patches/openwrt/0003-ntpd-host-as-string.patch > index 0fb14c7b..26c541da 100644 > --- a/build_patches/openwrt/0003-ntpd-host-as-string.patch > +++ b/build_patches/openwrt/0003-ntpd-host-as-string.patch > @@ -1,11 +1,6 @@ > -From 380f33fde8bfb4e35eae7e5073ca2d0fd8270abf Mon Sep 17 00:00:00 2001 > From: Tim Niemeyer <tim@tn-x.org> > Date: Sat, 8 Jul 2017 10:47:56 +0200 > -Subject: [PATCH 3/4] ntpd host as string > - > ---- > - package/utils/busybox/files/sysntpd | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > +Subject: ntpd host as string > > diff --git a/package/utils/busybox/files/sysntpd > b/package/utils/busybox/files/sysntpd > index e693e4031c..12383a4937 100755 > diff --git a/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch > b/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch > index 8aae6d02..a3858199 100644 > --- a/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch > +++ b/build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch > @@ -1,12 +1,6 @@ > -From 924934df6ca9696888f1b520560c8bc4df1d59eb Mon Sep 17 00:00:00 2001 > From: Tim Niemeyer <tim@tn-x.org> > Date: Sat, 8 Jul 2017 10:48:53 +0200 > -Subject: [PATCH 4/4] ar71xx-4.9-l2tp-stats > - > ---- > - ...-stats-counter-overflow-on-32-bit-systems.patch | 38 > ++++++++++++++++++++++ > - 1 file changed, 38 insertions(+) > - create mode 100644 > target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bit- > systems.patch > +Subject: ar71xx-4.9-l2tp-stats > > diff --git > a/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bi > t-systems.patch > b/target/linux/ar71xx/patches-4.9/fix-l2tp-stats-counter-overflow-on-32-bi > t-systems.patch > new file mode 100644 > diff --git > a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch > b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch > index 53e7a6f3..7e24ed19 100644 > --- a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch > +++ b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch > @@ -1,12 +1,6 @@ > -From e602e72f7e67db86264c7daf70c8cf2c32913139 Mon Sep 17 00:00:00 2001 > From: Tim Niemeyer <tim@tn-x.org> > Date: Mon, 6 Aug 2018 18:39:04 +0200 > -Subject: [PATCH] allow building all devives as tiny > - > ---- > - target/linux/ar71xx/image/Makefile | 5 +++++ > - target/linux/ar71xx/tiny/config-default | 15 +++++++++++++++ > - 2 files changed, 20 insertions(+) > +Subject: allow building all devives as tiny > > diff --git a/target/linux/ar71xx/image/Makefile > b/target/linux/ar71xx/image/Makefile > index 1eaf1e457c..602323bba2 100644 > diff --git > a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v > 3.patch > b/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v > 3.patch > index 941b7d73..de6aa7b8 100644 > --- > a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v > 3.patch > +++ > b/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v > 3.patch > @@ -1,15 +1,11 @@ > -From dc634e3bbd66089ea9d92f19983182bfdf2de13c Mon Sep 17 00:00:00 2001 > From: Adrian Schmutzler <freifunk@adrianschmutzler.de> > Date: Wed, 10 Oct 2018 20:05:53 +0200 > -Subject: [PATCH 1/2] firmware-utils: tplink-safeloader: Add CPE210 v3 > +Subject: firmware-utils: tplink-safeloader: Add CPE210 v3 > > Add TP-Link CPE210 v3 to the support list. > It's identical to the v2. > > Signed-off-by: Robert Marko <robimarko@gmail.com> > ---- > - tools/firmware-utils/src/tplink-safeloader.c | 8 ++++++-- > - 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/firmware-utils/src/tplink-safeloader.c > b/tools/firmware-utils/src/tplink-safeloader.c > index 4b227e1c97..01885683c3 100644 > diff --git > a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210- > v3.patc > h > b/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210- > v3.patc > h > index 7d6af911..8796a31f 100644 > --- > a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210- > v3.patc > h > +++ > b/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210- > v3.patc > h > @@ -1,7 +1,6 @@ > -From 2eca1d93647356939a7388847a65cb2533cc5858 Mon Sep 17 00:00:00 2001 > From: Adrian Schmutzler <freifunk@adrianschmutzler.de> > Date: Wed, 10 Oct 2018 20:13:09 +0200 > -Subject: [PATCH 2/2] ar71xx: Add support for TP-Link CPE210 v3 > +Subject: ar71xx: Add support for TP-Link CPE210 v3 > > Looks identical to the v2 > > @@ -24,15 +23,6 @@ Stock TFTP server IP:192.168.0.100 > Stock device TFTP address:192.168.0.254 > > Signed-off-by: Robert Marko <robimarko@gmail.com> > ---- > - target/linux/ar71xx/base-files/etc/board.d/01_leds | 4 +++- > - target/linux/ar71xx/base-files/etc/board.d/02_network | 1 + > - target/linux/ar71xx/base-files/lib/ar71xx.sh | 4 ++++ > - target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 3 ++- > - target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c | 3 +++ > - target/linux/ar71xx/files/arch/mips/ath79/machtypes.h | 1 + > - target/linux/ar71xx/image/generic-tp-link.mk | 7 +++++++ > - 7 files changed, 21 insertions(+), 2 deletions(-) > > diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds > b/target/linux/ar71xx/base-files/etc/board.d/01_leds > index 592133ac28..89cc0cbff7 100755 > -- > 2.11.0
Despite tidyness, this will also simplify diffs for later patch changes. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- build_patches/openwrt/0001-sysupgrade-no-config-save.patch | 7 +------ build_patches/openwrt/0002-set-root-password.patch | 7 +------ build_patches/openwrt/0003-ntpd-host-as-string.patch | 7 +------ build_patches/openwrt/0004-ar71xx-4.9-l2tp-stats.patch | 8 +------- .../openwrt/0005-allow-building-all-devives-as-tiny.patch | 8 +------- ...0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch | 6 +----- .../0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch | 12 +----------- 7 files changed, 7 insertions(+), 48 deletions(-)