* [DistroKit] [PATCH 0/2] Some fixes for new PTXdist versions @ 2021-01-13 11:45 Michael Olbrich 2021-01-13 11:45 ` [DistroKit] [PATCH 1/2] iproute2: remove local menu file Michael Olbrich 2021-01-13 11:45 ` [DistroKit] [PATCH 2/2] image-stm32mp157c-dk2: fix image creation with new PTXdist version Michael Olbrich 0 siblings, 2 replies; 6+ messages in thread From: Michael Olbrich @ 2021-01-13 11:45 UTC (permalink / raw) To: distrokit; +Cc: Michael Olbrich Hi, With the new PTXdist version in next, the local iproute2 menu file is no longer needed. And it breaks building with ptxdist master. The first patch removes this file. The second patch is a replacement for the last two commits in the next branch. PTXdist changed the TF-A file names for a reason, so they will stay that way. Fix the image config instead. Regards, Michael Michael Olbrich (2): iproute2: remove local menu file image-stm32mp157c-dk2: fix image creation with new PTXdist version .../platform-v7a/config/images/stm32mp.config | 4 +- rules/iproute2.in | 157 ------------------ 2 files changed, 2 insertions(+), 159 deletions(-) delete mode 100644 rules/iproute2.in -- 2.20.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* [DistroKit] [PATCH 1/2] iproute2: remove local menu file 2021-01-13 11:45 [DistroKit] [PATCH 0/2] Some fixes for new PTXdist versions Michael Olbrich @ 2021-01-13 11:45 ` Michael Olbrich 2021-01-15 12:07 ` Roland Hieber 2021-02-01 17:42 ` Robert Schwebel 2021-01-13 11:45 ` [DistroKit] [PATCH 2/2] image-stm32mp157c-dk2: fix image creation with new PTXdist version Michael Olbrich 1 sibling, 2 replies; 6+ messages in thread From: Michael Olbrich @ 2021-01-13 11:45 UTC (permalink / raw) To: distrokit; +Cc: Michael Olbrich It's no longer needed with the new ptxdist release. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- rules/iproute2.in | 157 ---------------------------------------------- 1 file changed, 157 deletions(-) delete mode 100644 rules/iproute2.in diff --git a/rules/iproute2.in b/rules/iproute2.in deleted file mode 100644 index 353a07f14b5e..000000000000 --- a/rules/iproute2.in +++ /dev/null @@ -1,157 +0,0 @@ -## SECTION=networking - -# NOTE: this can be removed after migrating to PTXdist 2020.10.0, which includes -# https://git.pengutronix.de/cgit/ptxdist/commit/?id=ee2867017402a411c279 - -menuconfig IPROUTE2 - tristate - prompt "iproute2 " - select DB if IPROUTE2_ARPD - select LIBCAP - select LIBC_DL - select LIBC_M - select LIBC_RESOLV - select LIBC_PTHREAD if IPROUTE2_ARPD - select GCCLIBS_GCC_S if IPROUTE2_IP || IPROUTE2_TC - select LIBSELINUX if GLOBAL_SELINUX - select LIBMNL if IPROUTE2_DEVLINK - help - Networking and traffic control tools - - The iproute suite, also known as iproute2, is a collection - of utilities for networking and traffic control. - - These tools communicate with the Linux kernel via the - (rt)netlink interface, providing advanced features not - available through the legacy net-tools commands 'ifconfig' - and 'route'. - -if IPROUTE2 - -config IPROUTE2_ARPD - bool - prompt "arpd" - help - Enabling this entry will enlarge your system by the berkely - DB4.x library. - -config IPROUTE2_BRIDGE - bool - prompt "bridge" - help - Show / manipulate bridge addresses and devices - -config IPROUTE2_CTSTAT - bool - prompt "ctstat" - help - The connection status utility. Maybe linked to lnstat. - -config IPROUTE2_DEVLINK - bool - prompt "devlink" - help - The devlink utility. - -config IPROUTE2_GENL - bool - prompt "genl" - help - Generic Netlink - -config IPROUTE2_IP - bool - depends on !BUSYBOX_IP || ALLYES - prompt "ip" - help - The main tool. Well known as in "ip addr" or "ip route". - -comment "busybox' ip is selected" - depends on BUSYBOX_IP - -config IPROUTE2_IFCFG - bool - prompt "ifcfg" - help - ifcfg is a script wrapping ip, written as replacement for - ifconfig. - Needs arping and rdisk programs from the iputils package. - -config IPROUTE2_IFSTAT - bool - prompt "ifstat" - help - handy utility to read net interface statistics - -config IPROUTE2_LNSTAT - bool - prompt "lnstat" - help - lnstat is a generalized and more feature-complete replacement - for the old rtstat program. In addition to routing cache - statistics, it supports any kind of statistics the linux - kernel exports via a file in /proc/net/stat/. - -config IPROUTE2_NSTAT - bool - prompt "nstat" - help - handy utility to read counters /proc/net/netstat and snmp - -config IPROUTE2_ROUTEF - bool - prompt "routef" - help - Component of ip route for flushing the routing tables - -config IPROUTE2_ROUTEL - bool - prompt "routel" - help - Component of ip route for listing the routing tables - -config IPROUTE2_RTACCT - bool - prompt "rtacct" - help - Used to display the contents of /proc/net/rt_acct - -config IPROUTE2_RTMON - bool - prompt "rtmon" - help - Route monitoring - -config IPROUTE2_RTPR - bool - prompt "rtpr" - help - A tool to make the output of "ip -o" readable - -config IPROUTE2_RTSTAT - bool - prompt "rtstat" - help - Route status utility, maybe linked to lnstat. - -config IPROUTE2_SS - bool - prompt "ss" - help - ss is used to dump socket statistics. It allows showing - information similar to netstat. It can display more TCP - and state information than other tools. - -config IPROUTE2_TC - bool - depends on !BUSYBOX_TC || ALLYES - prompt "tc" - help - tc is used to configure Traffic Control in the Linux Kernel, which - consists of Shaping, Scheduling, Policing and Dropping. - Processing of traffic is controlled by qdiscs, classes and filters. - -comment "busybox' tc is selected" - depends on BUSYBOX_TC - -endif -- 2.20.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [DistroKit] [PATCH 1/2] iproute2: remove local menu file 2021-01-13 11:45 ` [DistroKit] [PATCH 1/2] iproute2: remove local menu file Michael Olbrich @ 2021-01-15 12:07 ` Roland Hieber 2021-02-01 17:42 ` Robert Schwebel 1 sibling, 0 replies; 6+ messages in thread From: Roland Hieber @ 2021-01-15 12:07 UTC (permalink / raw) To: distrokit On Wed, Jan 13, 2021 at 12:45:34PM +0100, Michael Olbrich wrote: > It's no longer needed with the new ptxdist release. > > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > --- Tested-by: Roland Hieber <rhi@pengutronix.de> > rules/iproute2.in | 157 ---------------------------------------------- > 1 file changed, 157 deletions(-) > delete mode 100644 rules/iproute2.in > > diff --git a/rules/iproute2.in b/rules/iproute2.in > deleted file mode 100644 > index 353a07f14b5e..000000000000 > --- a/rules/iproute2.in > +++ /dev/null > @@ -1,157 +0,0 @@ > -## SECTION=networking > - > -# NOTE: this can be removed after migrating to PTXdist 2020.10.0, which includes > -# https://git.pengutronix.de/cgit/ptxdist/commit/?id=ee2867017402a411c279 > - > -menuconfig IPROUTE2 > - tristate > - prompt "iproute2 " > - select DB if IPROUTE2_ARPD > - select LIBCAP > - select LIBC_DL > - select LIBC_M > - select LIBC_RESOLV > - select LIBC_PTHREAD if IPROUTE2_ARPD > - select GCCLIBS_GCC_S if IPROUTE2_IP || IPROUTE2_TC > - select LIBSELINUX if GLOBAL_SELINUX > - select LIBMNL if IPROUTE2_DEVLINK > - help > - Networking and traffic control tools > - > - The iproute suite, also known as iproute2, is a collection > - of utilities for networking and traffic control. > - > - These tools communicate with the Linux kernel via the > - (rt)netlink interface, providing advanced features not > - available through the legacy net-tools commands 'ifconfig' > - and 'route'. > - > -if IPROUTE2 > - > -config IPROUTE2_ARPD > - bool > - prompt "arpd" > - help > - Enabling this entry will enlarge your system by the berkely > - DB4.x library. > - > -config IPROUTE2_BRIDGE > - bool > - prompt "bridge" > - help > - Show / manipulate bridge addresses and devices > - > -config IPROUTE2_CTSTAT > - bool > - prompt "ctstat" > - help > - The connection status utility. Maybe linked to lnstat. > - > -config IPROUTE2_DEVLINK > - bool > - prompt "devlink" > - help > - The devlink utility. > - > -config IPROUTE2_GENL > - bool > - prompt "genl" > - help > - Generic Netlink > - > -config IPROUTE2_IP > - bool > - depends on !BUSYBOX_IP || ALLYES > - prompt "ip" > - help > - The main tool. Well known as in "ip addr" or "ip route". > - > -comment "busybox' ip is selected" > - depends on BUSYBOX_IP > - > -config IPROUTE2_IFCFG > - bool > - prompt "ifcfg" > - help > - ifcfg is a script wrapping ip, written as replacement for > - ifconfig. > - Needs arping and rdisk programs from the iputils package. > - > -config IPROUTE2_IFSTAT > - bool > - prompt "ifstat" > - help > - handy utility to read net interface statistics > - > -config IPROUTE2_LNSTAT > - bool > - prompt "lnstat" > - help > - lnstat is a generalized and more feature-complete replacement > - for the old rtstat program. In addition to routing cache > - statistics, it supports any kind of statistics the linux > - kernel exports via a file in /proc/net/stat/. > - > -config IPROUTE2_NSTAT > - bool > - prompt "nstat" > - help > - handy utility to read counters /proc/net/netstat and snmp > - > -config IPROUTE2_ROUTEF > - bool > - prompt "routef" > - help > - Component of ip route for flushing the routing tables > - > -config IPROUTE2_ROUTEL > - bool > - prompt "routel" > - help > - Component of ip route for listing the routing tables > - > -config IPROUTE2_RTACCT > - bool > - prompt "rtacct" > - help > - Used to display the contents of /proc/net/rt_acct > - > -config IPROUTE2_RTMON > - bool > - prompt "rtmon" > - help > - Route monitoring > - > -config IPROUTE2_RTPR > - bool > - prompt "rtpr" > - help > - A tool to make the output of "ip -o" readable > - > -config IPROUTE2_RTSTAT > - bool > - prompt "rtstat" > - help > - Route status utility, maybe linked to lnstat. > - > -config IPROUTE2_SS > - bool > - prompt "ss" > - help > - ss is used to dump socket statistics. It allows showing > - information similar to netstat. It can display more TCP > - and state information than other tools. > - > -config IPROUTE2_TC > - bool > - depends on !BUSYBOX_TC || ALLYES > - prompt "tc" > - help > - tc is used to configure Traffic Control in the Linux Kernel, which > - consists of Shaping, Scheduling, Policing and Dropping. > - Processing of traffic is controlled by qdiscs, classes and filters. > - > -comment "busybox' tc is selected" > - depends on BUSYBOX_TC > - > -endif > -- > 2.20.1 > > > _______________________________________________ > DistroKit mailing list > DistroKit@pengutronix.de > -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [DistroKit] [PATCH 1/2] iproute2: remove local menu file 2021-01-13 11:45 ` [DistroKit] [PATCH 1/2] iproute2: remove local menu file Michael Olbrich 2021-01-15 12:07 ` Roland Hieber @ 2021-02-01 17:42 ` Robert Schwebel 1 sibling, 0 replies; 6+ messages in thread From: Robert Schwebel @ 2021-02-01 17:42 UTC (permalink / raw) To: Michael Olbrich; +Cc: distrokit On Wed, Jan 13, 2021 at 12:45:34PM +0100, Michael Olbrich wrote: > It's no longer needed with the new ptxdist release. > > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > --- > rules/iproute2.in | 157 ---------------------------------------------- > 1 file changed, 157 deletions(-) > delete mode 100644 rules/iproute2.in Applied, thx. rsc -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* [DistroKit] [PATCH 2/2] image-stm32mp157c-dk2: fix image creation with new PTXdist version 2021-01-13 11:45 [DistroKit] [PATCH 0/2] Some fixes for new PTXdist versions Michael Olbrich 2021-01-13 11:45 ` [DistroKit] [PATCH 1/2] iproute2: remove local menu file Michael Olbrich @ 2021-01-13 11:45 ` Michael Olbrich 2021-02-01 17:43 ` Robert Schwebel 1 sibling, 1 reply; 6+ messages in thread From: Michael Olbrich @ 2021-01-13 11:45 UTC (permalink / raw) To: distrokit; +Cc: Michael Olbrich The names of the TF-A files changed with the new PTXdist version. This was necessary to support multiple platforms in one build: The platforms may create images with the same name. Without the aditional prefix, the names clash when copoed to images/. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- configs/platform-v7a/config/images/stm32mp.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config index c10632013127..84ad1191d571 100644 --- a/configs/platform-v7a/config/images/stm32mp.config +++ b/configs/platform-v7a/config/images/stm32mp.config @@ -4,11 +4,11 @@ image @IMAGE@ { gpt = "true" } partition fsbl1 { - image = "tf-a-@STM32MP_BOARD@.stm32" + image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32" size = 256K } partition fsbl2 { - image = "tf-a-@STM32MP_BOARD@.stm32" + image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32" size = 256K } partition ssbl { -- 2.20.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [DistroKit] [PATCH 2/2] image-stm32mp157c-dk2: fix image creation with new PTXdist version 2021-01-13 11:45 ` [DistroKit] [PATCH 2/2] image-stm32mp157c-dk2: fix image creation with new PTXdist version Michael Olbrich @ 2021-02-01 17:43 ` Robert Schwebel 0 siblings, 0 replies; 6+ messages in thread From: Robert Schwebel @ 2021-02-01 17:43 UTC (permalink / raw) To: Michael Olbrich; +Cc: distrokit On Wed, Jan 13, 2021 at 12:45:35PM +0100, Michael Olbrich wrote: > The names of the TF-A files changed with the new PTXdist version. This was > necessary to support multiple platforms in one build: The platforms may > create images with the same name. Without the aditional prefix, the names > clash when copoed to images/. > > Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> > --- > configs/platform-v7a/config/images/stm32mp.config | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied, thx. rsc -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-01 17:43 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-01-13 11:45 [DistroKit] [PATCH 0/2] Some fixes for new PTXdist versions Michael Olbrich 2021-01-13 11:45 ` [DistroKit] [PATCH 1/2] iproute2: remove local menu file Michael Olbrich 2021-01-15 12:07 ` Roland Hieber 2021-02-01 17:42 ` Robert Schwebel 2021-01-13 11:45 ` [DistroKit] [PATCH 2/2] image-stm32mp157c-dk2: fix image creation with new PTXdist version Michael Olbrich 2021-02-01 17:43 ` Robert Schwebel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox