| Message ID | 20190822005924.32310-1-mail@aparcar.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [OpenWrt-Devel] ipqx0xx: add Generic subtarget | expand |
On 22/08/2019 02:59, Paul Spooren wrote: > Both targets miss a subtarget causing an image naming style which is > different from other all othe targets, even tho it already uses > `x/generic/` as subfolder as if the subtarget would exist. > > This commit adds the Generic subtarget resulting in consistent naming. > > ~/src/openwrt/openwrt/bin/targets/ipq806x/generic$ ls > openwrt-ipq806x-generic-netgear_d7800-initramfs-uImage > openwrt-ipq806x-generic-netgear-d7800.manifest > openwrt-ipq806x-generic-netgear_d7800-squashfs-factory.img > openwrt-ipq806x-generic-netgear_d7800-squashfs-sysupgrade.bin Why would we need to have the generic in the name if there is no other non-generic subtarget ? John > CC: John Crispin <john@phrozen.org> > > Signed-off-by: Paul Spooren <mail@aparcar.org> > --- > target/linux/ipq40xx/Makefile | 1 + > target/linux/ipq40xx/generic/target.mk | 1 + > target/linux/ipq806x/Makefile | 1 + > target/linux/ipq806x/generic/target.mk | 1 + > 4 files changed, 4 insertions(+) > create mode 100644 target/linux/ipq40xx/generic/target.mk > create mode 100644 target/linux/ipq806x/generic/target.mk > > diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile > index 9b78d1f1bf..9e26b277fa 100644 > --- a/target/linux/ipq40xx/Makefile > +++ b/target/linux/ipq40xx/Makefile > @@ -7,6 +7,7 @@ FEATURES:=squashfs fpu ramdisk nand > CPU_TYPE:=cortex-a7 > CPU_SUBTYPE:=neon-vfpv4 > MAINTAINER:=John Crispin <john@phrozen.org> > +SUBTARGETS:=generic > > KERNEL_PATCHVER:=4.19 > > diff --git a/target/linux/ipq40xx/generic/target.mk b/target/linux/ipq40xx/generic/target.mk > new file mode 100644 > index 0000000000..f5cb1fb19b > --- /dev/null > +++ b/target/linux/ipq40xx/generic/target.mk > @@ -0,0 +1 @@ > +BOARDNAME:=Generic > diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile > index cd0e8b82ea..19ed015ebc 100644 > --- a/target/linux/ipq806x/Makefile > +++ b/target/linux/ipq806x/Makefile > @@ -9,6 +9,7 @@ FEATURES:=squashfs nand fpu ramdisk > CPU_TYPE:=cortex-a15 > CPU_SUBTYPE:=neon-vfpv4 > MAINTAINER:=John Crispin <john@phrozen.org> > +SUBTARGETS:=generic > > KERNEL_PATCHVER:=4.14 > > diff --git a/target/linux/ipq806x/generic/target.mk b/target/linux/ipq806x/generic/target.mk > new file mode 100644 > index 0000000000..f5cb1fb19b > --- /dev/null > +++ b/target/linux/ipq806x/generic/target.mk > @@ -0,0 +1 @@ > +BOARDNAME:=Generic
Hi John, > This commit adds the Generic subtarget resulting in consistent naming. and > already uses `x/generic/` as subfolder as if the subtarget would exist. I'm very much in favor of consistent names[0][1][2] as it reduces the hassle when trying automate things, like building images via an API[3]. Is the subtarget causing any harm except for eight additional characters per filename? Paul [0]: https://github.com/openwrt/openwrt/pull/2330 [1]: https://github.com/openwrt/openwrt/pull/2334 [2]: https://github.com/openwrt/openwrt/pull/2326 [3]: https://github.com/aparcar/attendedsysupgrade-server
On 22/08/2019 08:47, Paul Spooren wrote: > Hi John, >> This commit adds the Generic subtarget resulting in consistent naming. > > and > >> already uses `x/generic/` as subfolder as if the subtarget would exist. > > I'm very much in favor of consistent names[0][1][2] as it reduces the > hassle when trying automate things, like building images via an API[3]. > > Is the subtarget causing any harm except for eight additional > characters per filename? > > Paul > > [0]: https://github.com/openwrt/openwrt/pull/2330 > [1]: https://github.com/openwrt/openwrt/pull/2334 > [2]: https://github.com/openwrt/openwrt/pull/2326 > [3]: https://github.com/aparcar/attendedsysupgrade-server > dont really care, just wondering why John
On 22.08.19 00:11, John Crispin wrote: > > On 22/08/2019 08:47, Paul Spooren wrote: >> Hi John, >>> This commit adds the Generic subtarget resulting in consistent naming. >> >> and >> >>> already uses `x/generic/` as subfolder as if the subtarget would exist. >> >> I'm very much in favor of consistent names[0][1][2] as it reduces the >> hassle when trying automate things, like building images via an API[3]. >> >> Is the subtarget causing any harm except for eight additional >> characters per filename? >> >> Paul >> >> [0]: https://github.com/openwrt/openwrt/pull/2330 >> [1]: https://github.com/openwrt/openwrt/pull/2334 >> [2]: https://github.com/openwrt/openwrt/pull/2326 >> [3]: https://github.com/aparcar/attendedsysupgrade-server >> > dont really care, just wondering why If you don't mind please merge it, I think it's the last target without a defined subtarget. Paul
> -----Original Message----- > From: openwrt-devel [mailto:openwrt-devel-bounces@lists.openwrt.org] > On Behalf Of Paul Spooren > Sent: Donnerstag, 22. August 2019 21:07 > To: John Crispin <john@phrozen.org>; openwrt-devel@lists.openwrt.org > Subject: Re: [OpenWrt-Devel] [PATCH] ipqx0xx: add Generic subtarget > > > On 22.08.19 00:11, John Crispin wrote: > > > > On 22/08/2019 08:47, Paul Spooren wrote: > >> Hi John, > >>> This commit adds the Generic subtarget resulting in consistent naming. > >> > >> and > >> > >>> already uses `x/generic/` as subfolder as if the subtarget would exist. > >> > >> I'm very much in favor of consistent names[0][1][2] as it reduces the > >> hassle when trying automate things, like building images via an API[3]. > >> > >> Is the subtarget causing any harm except for eight additional > >> characters per filename? > >> > >> Paul > >> > >> [0]: https://github.com/openwrt/openwrt/pull/2330 > >> [1]: https://github.com/openwrt/openwrt/pull/2334 > >> [2]: https://github.com/openwrt/openwrt/pull/2326 > >> [3]: https://github.com/aparcar/attendedsysupgrade-server > >> > > dont really care, just wondering why > > If you don't mind please merge it, I think it's the last target without a defined > subtarget. > > Paul > Just to back Paul up, I also think this will be helpful, as we just have one special case to deal with (i.e. targets without subtarget) less and it doesn't hurt much. Best Adrian
diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 9b78d1f1bf..9e26b277fa 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -7,6 +7,7 @@ FEATURES:=squashfs fpu ramdisk nand CPU_TYPE:=cortex-a7 CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin <john@phrozen.org> +SUBTARGETS:=generic KERNEL_PATCHVER:=4.19 diff --git a/target/linux/ipq40xx/generic/target.mk b/target/linux/ipq40xx/generic/target.mk new file mode 100644 index 0000000000..f5cb1fb19b --- /dev/null +++ b/target/linux/ipq40xx/generic/target.mk @@ -0,0 +1 @@ +BOARDNAME:=Generic diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index cd0e8b82ea..19ed015ebc 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -9,6 +9,7 @@ FEATURES:=squashfs nand fpu ramdisk CPU_TYPE:=cortex-a15 CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin <john@phrozen.org> +SUBTARGETS:=generic KERNEL_PATCHVER:=4.14 diff --git a/target/linux/ipq806x/generic/target.mk b/target/linux/ipq806x/generic/target.mk new file mode 100644 index 0000000000..f5cb1fb19b --- /dev/null +++ b/target/linux/ipq806x/generic/target.mk @@ -0,0 +1 @@ +BOARDNAME:=Generic
Both targets miss a subtarget causing an image naming style which is different from other all othe targets, even tho it already uses `x/generic/` as subfolder as if the subtarget would exist. This commit adds the Generic subtarget resulting in consistent naming. ~/src/openwrt/openwrt/bin/targets/ipq806x/generic$ ls openwrt-ipq806x-generic-netgear_d7800-initramfs-uImage openwrt-ipq806x-generic-netgear-d7800.manifest openwrt-ipq806x-generic-netgear_d7800-squashfs-factory.img openwrt-ipq806x-generic-netgear_d7800-squashfs-sysupgrade.bin CC: John Crispin <john@phrozen.org> Signed-off-by: Paul Spooren <mail@aparcar.org> --- target/linux/ipq40xx/Makefile | 1 + target/linux/ipq40xx/generic/target.mk | 1 + target/linux/ipq806x/Makefile | 1 + target/linux/ipq806x/generic/target.mk | 1 + 4 files changed, 4 insertions(+) create mode 100644 target/linux/ipq40xx/generic/target.mk create mode 100644 target/linux/ipq806x/generic/target.mk