From 23bf77373f5d6c3130a25fc3eb48ac863978ce93 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Wed, 24 Aug 2022 07:54:37 -0500 Subject: lwip.py: Remove usage of YAML YAML is not supported in base Python installs and so is not safe to blindly assume is available. This swaps existing usage to JSON to be more compatible. --- file-import.json | 246 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ file-import.yaml | 243 ------------------------------------------------------ lwip-to-rtems.py | 5 +- lwip.py | 6 +- 4 files changed, 251 insertions(+), 249 deletions(-) create mode 100644 file-import.json delete mode 100644 file-import.yaml diff --git a/file-import.json b/file-import.json new file mode 100644 index 0000000..da30616 --- /dev/null +++ b/file-import.json @@ -0,0 +1,246 @@ +{ + "files-to-import" : [ + "src/core/altcp_alloc.c", + "src/core/def.c", + "src/core/mem.c", + "src/core/altcp.c", + "src/core/altcp_tcp.c", + "src/core/raw.c", + "src/core/tcp_out.c", + "src/core/pbuf.c", + "src/core/ip.c", + "src/core/init.c", + "src/core/timeouts.c", + "src/core/inet_chksum.c", + "src/core/sys.c", + "src/core/memp.c", + "src/core/dns.c", + "src/core/tcp.c", + "src/core/udp.c", + "src/core/netif.c", + "src/core/stats.c", + "src/core/tcp_in.c", + "src/core/ipv6/mld6.c", + "src/core/ipv6/dhcp6.c", + "src/core/ipv6/nd6.c", + "src/core/ipv6/inet6.c", + "src/core/ipv6/ip6_frag.c", + "src/core/ipv6/ip6_addr.c", + "src/core/ipv6/icmp6.c", + "src/core/ipv6/ethip6.c", + "src/core/ipv6/ip6.c", + "src/core/ipv4/icmp.c", + "src/core/ipv4/autoip.c", + "src/core/ipv4/ip4_addr.c", + "src/core/ipv4/ip4_frag.c", + "src/core/ipv4/ip4.c", + "src/core/ipv4/igmp.c", + "src/core/ipv4/etharp.c", + "src/core/ipv4/dhcp.c", + "src/api/sockets.c", + "src/api/netdb.c", + "src/api/netbuf.c", + "src/api/api_lib.c", + "src/api/api_msg.c", + "src/api/tcpip.c", + "src/api/netifapi.c", + "src/api/if_api.c", + "src/api/err.c", + "src/netif/ethernet.c", + "src/netif/bridgeif_fdb.c", + "src/netif/lowpan6.c", + "src/netif/slipif.c", + "src/netif/lowpan6_ble.c", + "src/netif/zepif.c", + "src/netif/lowpan6_common.c", + "src/netif/bridgeif.c", + "src/netif/ppp/pppol2tp.c", + "src/netif/ppp/magic.c", + "src/netif/ppp/ppp.c", + "src/netif/ppp/utils.c", + "src/netif/ppp/ipcp.c", + "src/netif/ppp/pppoe.c", + "src/netif/ppp/eui64.c", + "src/netif/ppp/vj.c", + "src/netif/ppp/pppapi.c", + "src/netif/ppp/lcp.c", + "src/netif/ppp/demand.c", + "src/netif/ppp/upap.c", + "src/netif/ppp/chap_ms.c", + "src/netif/ppp/eap.c", + "src/netif/ppp/multilink.c", + "src/netif/ppp/pppos.c", + "src/netif/ppp/auth.c", + "src/netif/ppp/fsm.c", + "src/netif/ppp/mppe.c", + "src/netif/ppp/chap-new.c", + "src/netif/ppp/ecp.c", + "src/netif/ppp/ipv6cp.c", + "src/netif/ppp/ccp.c", + "src/netif/ppp/chap-md5.c", + "src/netif/ppp/pppcrypt.c", + "src/netif/ppp/polarssl/sha1.c", + "src/netif/ppp/polarssl/md5.c", + "src/netif/ppp/polarssl/des.c", + "src/netif/ppp/polarssl/arc4.c", + "src/netif/ppp/polarssl/md4.c", + "src/include/compat/posix/netdb.h", + "src/include/compat/posix/sys/socket.h", + "src/include/compat/posix/arpa/inet.h", + "src/include/compat/posix/net/if.h", + "src/include/compat/stdc/errno.h", + "src/include/lwip/mld6.h", + "src/include/lwip/tcpbase.h", + "src/include/lwip/inet_chksum.h", + "src/include/lwip/sys.h", + "src/include/lwip/def.h", + "src/include/lwip/init.h.cmake.in", + "src/include/lwip/netifapi.h", + "src/include/lwip/errno.h", + "src/include/lwip/memp.h", + "src/include/lwip/err.h", + "src/include/lwip/dhcp6.h", + "src/include/lwip/netif.h", + "src/include/lwip/arch.h", + "src/include/lwip/mem.h", + "src/include/lwip/snmp.h", + "src/include/lwip/sockets.h", + "src/include/lwip/icmp.h", + "src/include/lwip/dhcp.h", + "src/include/lwip/if_api.h", + "src/include/lwip/ip_addr.h", + "src/include/lwip/ip6_addr.h", + "src/include/lwip/ethip6.h", + "src/include/lwip/udp.h", + "src/include/lwip/netbuf.h", + "src/include/lwip/ip6.h", + "src/include/lwip/altcp.h", + "src/include/lwip/etharp.h", + "src/include/lwip/altcp_tls.h", + "src/include/lwip/opt.h", + "src/include/lwip/stats.h", + "src/include/lwip/api.h", + "src/include/lwip/ip4_frag.h", + "src/include/lwip/sio.h", + "src/include/lwip/inet.h", + "src/include/lwip/ip6_frag.h", + "src/include/lwip/ip6_zone.h", + "src/include/lwip/tcpip.h", + "src/include/lwip/autoip.h", + "src/include/lwip/dns.h", + "src/include/lwip/igmp.h", + "src/include/lwip/timeouts.h", + "src/include/lwip/icmp6.h", + "src/include/lwip/pbuf.h", + "src/include/lwip/ip4.h", + "src/include/lwip/nd6.h", + "src/include/lwip/altcp_tcp.h", + "src/include/lwip/tcp.h", + "src/include/lwip/debug.h", + "src/include/lwip/raw.h", + "src/include/lwip/init.h", + "src/include/lwip/ip.h", + "src/include/lwip/netdb.h", + "src/include/lwip/ip4_addr.h", + "src/include/lwip/priv/api_msg.h", + "src/include/lwip/priv/tcpip_priv.h", + "src/include/lwip/priv/raw_priv.h", + "src/include/lwip/priv/nd6_priv.h", + "src/include/lwip/priv/altcp_priv.h", + "src/include/lwip/priv/sockets_priv.h", + "src/include/lwip/priv/memp_priv.h", + "src/include/lwip/priv/memp_std.h", + "src/include/lwip/priv/tcp_priv.h", + "src/include/lwip/priv/mem_priv.h", + "src/include/lwip/prot/mld6.h", + "src/include/lwip/prot/dhcp6.h", + "src/include/lwip/prot/ethernet.h", + "src/include/lwip/prot/ieee.h", + "src/include/lwip/prot/icmp.h", + "src/include/lwip/prot/dhcp.h", + "src/include/lwip/prot/iana.h", + "src/include/lwip/prot/udp.h", + "src/include/lwip/prot/ip6.h", + "src/include/lwip/prot/etharp.h", + "src/include/lwip/prot/autoip.h", + "src/include/lwip/prot/dns.h", + "src/include/lwip/prot/igmp.h", + "src/include/lwip/prot/icmp6.h", + "src/include/lwip/prot/ip4.h", + "src/include/lwip/prot/nd6.h", + "src/include/lwip/prot/tcp.h", + "src/include/lwip/prot/ip.h", + "src/include/lwip/apps/FILES", + "src/include/lwip/apps/mqtt_opts.h", + "src/include/lwip/apps/lwiperf.h", + "src/include/lwip/apps/snmp_snmpv2_usm.h", + "src/include/lwip/apps/httpd.h", + "src/include/lwip/apps/snmp_table.h", + "src/include/lwip/apps/snmp_scalar.h", + "src/include/lwip/apps/altcp_tls_mbedtls_opts.h", + "src/include/lwip/apps/snmp.h", + "src/include/lwip/apps/snmp_opts.h", + "src/include/lwip/apps/mdns.h", + "src/include/lwip/apps/fs.h", + "src/include/lwip/apps/tftp_opts.h", + "src/include/lwip/apps/mqtt_priv.h", + "src/include/lwip/apps/snmp_threadsync.h", + "src/include/lwip/apps/mdns_priv.h", + "src/include/lwip/apps/smtp.h", + "src/include/lwip/apps/netbiosns.h", + "src/include/lwip/apps/altcp_proxyconnect.h", + "src/include/lwip/apps/netbiosns_opts.h", + "src/include/lwip/apps/sntp.h", + "src/include/lwip/apps/snmp_snmpv2_framework.h", + "src/include/lwip/apps/tftp_server.h", + "src/include/lwip/apps/sntp_opts.h", + "src/include/lwip/apps/smtp_opts.h", + "src/include/lwip/apps/snmpv3.h", + "src/include/lwip/apps/mdns_opts.h", + "src/include/lwip/apps/snmp_core.h", + "src/include/lwip/apps/snmp_mib2.h", + "src/include/lwip/apps/http_client.h", + "src/include/lwip/apps/httpd_opts.h", + "src/include/lwip/apps/mqtt.h", + "src/include/netif/ethernet.h", + "src/include/netif/zepif.h", + "src/include/netif/lowpan6_common.h", + "src/include/netif/slipif.h", + "src/include/netif/bridgeif.h", + "src/include/netif/etharp.h", + "src/include/netif/bridgeif_opts.h", + "src/include/netif/lowpan6.h", + "src/include/netif/ieee802154.h", + "src/include/netif/lowpan6_opts.h", + "src/include/netif/lowpan6_ble.h", + "src/include/netif/ppp/magic.h", + "src/include/netif/ppp/pppapi.h", + "src/include/netif/ppp/ecp.h", + "src/include/netif/ppp/mppe.h", + "src/include/netif/ppp/pppoe.h", + "src/include/netif/ppp/ppp.h", + "src/include/netif/ppp/vj.h", + "src/include/netif/ppp/upap.h", + "src/include/netif/ppp/ipcp.h", + "src/include/netif/ppp/pppol2tp.h", + "src/include/netif/ppp/chap_ms.h", + "src/include/netif/ppp/chap-md5.h", + "src/include/netif/ppp/eui64.h", + "src/include/netif/ppp/eap.h", + "src/include/netif/ppp/lcp.h", + "src/include/netif/ppp/pppcrypt.h", + "src/include/netif/ppp/ppp_opts.h", + "src/include/netif/ppp/pppos.h", + "src/include/netif/ppp/ccp.h", + "src/include/netif/ppp/chap-new.h", + "src/include/netif/ppp/ppp_impl.h", + "src/include/netif/ppp/pppdebug.h", + "src/include/netif/ppp/ipv6cp.h", + "src/include/netif/ppp/fsm.h", + "src/include/netif/ppp/polarssl/arc4.h", + "src/include/netif/ppp/polarssl/sha1.h", + "src/include/netif/ppp/polarssl/md4.h", + "src/include/netif/ppp/polarssl/des.h", + "src/include/netif/ppp/polarssl/md5.h" + ] +} diff --git a/file-import.yaml b/file-import.yaml deleted file mode 100644 index 9e362bf..0000000 --- a/file-import.yaml +++ /dev/null @@ -1,243 +0,0 @@ -files-to-import: - - src/core/altcp_alloc.c - - src/core/def.c - - src/core/mem.c - - src/core/altcp.c - - src/core/altcp_tcp.c - - src/core/raw.c - - src/core/tcp_out.c - - src/core/pbuf.c - - src/core/ip.c - - src/core/init.c - - src/core/timeouts.c - - src/core/inet_chksum.c - - src/core/sys.c - - src/core/memp.c - - src/core/dns.c - - src/core/tcp.c - - src/core/udp.c - - src/core/netif.c - - src/core/stats.c - - src/core/tcp_in.c - - src/core/ipv6/mld6.c - - src/core/ipv6/dhcp6.c - - src/core/ipv6/nd6.c - - src/core/ipv6/inet6.c - - src/core/ipv6/ip6_frag.c - - src/core/ipv6/ip6_addr.c - - src/core/ipv6/icmp6.c - - src/core/ipv6/ethip6.c - - src/core/ipv6/ip6.c - - src/core/ipv4/icmp.c - - src/core/ipv4/autoip.c - - src/core/ipv4/ip4_addr.c - - src/core/ipv4/ip4_frag.c - - src/core/ipv4/ip4.c - - src/core/ipv4/igmp.c - - src/core/ipv4/etharp.c - - src/core/ipv4/dhcp.c - - src/api/sockets.c - - src/api/netdb.c - - src/api/netbuf.c - - src/api/api_lib.c - - src/api/api_msg.c - - src/api/tcpip.c - - src/api/netifapi.c - - src/api/if_api.c - - src/api/err.c - - src/netif/ethernet.c - - src/netif/bridgeif_fdb.c - - src/netif/lowpan6.c - - src/netif/slipif.c - - src/netif/lowpan6_ble.c - - src/netif/zepif.c - - src/netif/lowpan6_common.c - - src/netif/bridgeif.c - - src/netif/ppp/pppol2tp.c - - src/netif/ppp/magic.c - - src/netif/ppp/ppp.c - - src/netif/ppp/utils.c - - src/netif/ppp/ipcp.c - - src/netif/ppp/pppoe.c - - src/netif/ppp/eui64.c - - src/netif/ppp/vj.c - - src/netif/ppp/pppapi.c - - src/netif/ppp/lcp.c - - src/netif/ppp/demand.c - - src/netif/ppp/upap.c - - src/netif/ppp/chap_ms.c - - src/netif/ppp/eap.c - - src/netif/ppp/multilink.c - - src/netif/ppp/pppos.c - - src/netif/ppp/auth.c - - src/netif/ppp/fsm.c - - src/netif/ppp/mppe.c - - src/netif/ppp/chap-new.c - - src/netif/ppp/ecp.c - - src/netif/ppp/ipv6cp.c - - src/netif/ppp/ccp.c - - src/netif/ppp/chap-md5.c - - src/netif/ppp/pppcrypt.c - - src/netif/ppp/polarssl/sha1.c - - src/netif/ppp/polarssl/md5.c - - src/netif/ppp/polarssl/des.c - - src/netif/ppp/polarssl/arc4.c - - src/netif/ppp/polarssl/md4.c - - src/include/compat/posix/netdb.h - - src/include/compat/posix/sys/socket.h - - src/include/compat/posix/arpa/inet.h - - src/include/compat/posix/net/if.h - - src/include/compat/stdc/errno.h - - src/include/lwip/mld6.h - - src/include/lwip/tcpbase.h - - src/include/lwip/inet_chksum.h - - src/include/lwip/sys.h - - src/include/lwip/def.h - - src/include/lwip/init.h.cmake.in - - src/include/lwip/netifapi.h - - src/include/lwip/errno.h - - src/include/lwip/memp.h - - src/include/lwip/err.h - - src/include/lwip/dhcp6.h - - src/include/lwip/netif.h - - src/include/lwip/arch.h - - src/include/lwip/mem.h - - src/include/lwip/snmp.h - - src/include/lwip/sockets.h - - src/include/lwip/icmp.h - - src/include/lwip/dhcp.h - - src/include/lwip/if_api.h - - src/include/lwip/ip_addr.h - - src/include/lwip/ip6_addr.h - - src/include/lwip/ethip6.h - - src/include/lwip/udp.h - - src/include/lwip/netbuf.h - - src/include/lwip/ip6.h - - src/include/lwip/altcp.h - - src/include/lwip/etharp.h - - src/include/lwip/altcp_tls.h - - src/include/lwip/opt.h - - src/include/lwip/stats.h - - src/include/lwip/api.h - - src/include/lwip/ip4_frag.h - - src/include/lwip/sio.h - - src/include/lwip/inet.h - - src/include/lwip/ip6_frag.h - - src/include/lwip/ip6_zone.h - - src/include/lwip/tcpip.h - - src/include/lwip/autoip.h - - src/include/lwip/dns.h - - src/include/lwip/igmp.h - - src/include/lwip/timeouts.h - - src/include/lwip/icmp6.h - - src/include/lwip/pbuf.h - - src/include/lwip/ip4.h - - src/include/lwip/nd6.h - - src/include/lwip/altcp_tcp.h - - src/include/lwip/tcp.h - - src/include/lwip/debug.h - - src/include/lwip/raw.h - - src/include/lwip/init.h - - src/include/lwip/ip.h - - src/include/lwip/netdb.h - - src/include/lwip/ip4_addr.h - - src/include/lwip/priv/api_msg.h - - src/include/lwip/priv/tcpip_priv.h - - src/include/lwip/priv/raw_priv.h - - src/include/lwip/priv/nd6_priv.h - - src/include/lwip/priv/altcp_priv.h - - src/include/lwip/priv/sockets_priv.h - - src/include/lwip/priv/memp_priv.h - - src/include/lwip/priv/memp_std.h - - src/include/lwip/priv/tcp_priv.h - - src/include/lwip/priv/mem_priv.h - - src/include/lwip/prot/mld6.h - - src/include/lwip/prot/dhcp6.h - - src/include/lwip/prot/ethernet.h - - src/include/lwip/prot/ieee.h - - src/include/lwip/prot/icmp.h - - src/include/lwip/prot/dhcp.h - - src/include/lwip/prot/iana.h - - src/include/lwip/prot/udp.h - - src/include/lwip/prot/ip6.h - - src/include/lwip/prot/etharp.h - - src/include/lwip/prot/autoip.h - - src/include/lwip/prot/dns.h - - src/include/lwip/prot/igmp.h - - src/include/lwip/prot/icmp6.h - - src/include/lwip/prot/ip4.h - - src/include/lwip/prot/nd6.h - - src/include/lwip/prot/tcp.h - - src/include/lwip/prot/ip.h - - src/include/lwip/apps/FILES - - src/include/lwip/apps/mqtt_opts.h - - src/include/lwip/apps/lwiperf.h - - src/include/lwip/apps/snmp_snmpv2_usm.h - - src/include/lwip/apps/httpd.h - - src/include/lwip/apps/snmp_table.h - - src/include/lwip/apps/snmp_scalar.h - - src/include/lwip/apps/altcp_tls_mbedtls_opts.h - - src/include/lwip/apps/snmp.h - - src/include/lwip/apps/snmp_opts.h - - src/include/lwip/apps/mdns.h - - src/include/lwip/apps/fs.h - - src/include/lwip/apps/tftp_opts.h - - src/include/lwip/apps/mqtt_priv.h - - src/include/lwip/apps/snmp_threadsync.h - - src/include/lwip/apps/mdns_priv.h - - src/include/lwip/apps/smtp.h - - src/include/lwip/apps/netbiosns.h - - src/include/lwip/apps/altcp_proxyconnect.h - - src/include/lwip/apps/netbiosns_opts.h - - src/include/lwip/apps/sntp.h - - src/include/lwip/apps/snmp_snmpv2_framework.h - - src/include/lwip/apps/tftp_server.h - - src/include/lwip/apps/sntp_opts.h - - src/include/lwip/apps/smtp_opts.h - - src/include/lwip/apps/snmpv3.h - - src/include/lwip/apps/mdns_opts.h - - src/include/lwip/apps/snmp_core.h - - src/include/lwip/apps/snmp_mib2.h - - src/include/lwip/apps/http_client.h - - src/include/lwip/apps/httpd_opts.h - - src/include/lwip/apps/mqtt.h - - src/include/netif/ethernet.h - - src/include/netif/zepif.h - - src/include/netif/lowpan6_common.h - - src/include/netif/slipif.h - - src/include/netif/bridgeif.h - - src/include/netif/etharp.h - - src/include/netif/bridgeif_opts.h - - src/include/netif/lowpan6.h - - src/include/netif/ieee802154.h - - src/include/netif/lowpan6_opts.h - - src/include/netif/lowpan6_ble.h - - src/include/netif/ppp/magic.h - - src/include/netif/ppp/pppapi.h - - src/include/netif/ppp/ecp.h - - src/include/netif/ppp/mppe.h - - src/include/netif/ppp/pppoe.h - - src/include/netif/ppp/ppp.h - - src/include/netif/ppp/vj.h - - src/include/netif/ppp/upap.h - - src/include/netif/ppp/ipcp.h - - src/include/netif/ppp/pppol2tp.h - - src/include/netif/ppp/chap_ms.h - - src/include/netif/ppp/chap-md5.h - - src/include/netif/ppp/eui64.h - - src/include/netif/ppp/eap.h - - src/include/netif/ppp/lcp.h - - src/include/netif/ppp/pppcrypt.h - - src/include/netif/ppp/ppp_opts.h - - src/include/netif/ppp/pppos.h - - src/include/netif/ppp/ccp.h - - src/include/netif/ppp/chap-new.h - - src/include/netif/ppp/ppp_impl.h - - src/include/netif/ppp/pppdebug.h - - src/include/netif/ppp/ipv6cp.h - - src/include/netif/ppp/fsm.h - - src/include/netif/ppp/polarssl/arc4.h - - src/include/netif/ppp/polarssl/sha1.h - - src/include/netif/ppp/polarssl/md4.h - - src/include/netif/ppp/polarssl/des.h - - src/include/netif/ppp/polarssl/md5.h diff --git a/lwip-to-rtems.py b/lwip-to-rtems.py index c6776db..acd6922 100755 --- a/lwip-to-rtems.py +++ b/lwip-to-rtems.py @@ -28,7 +28,7 @@ from __future__ import print_function import os import sys import getopt -import yaml +import json from shutil import copyfile from pathlib import Path @@ -87,8 +87,7 @@ print("Direction: %s" % (("reverse", "forward")[isForward])) def copyFiles(isforward): if (isforward): - config_file = open('file-import.yaml', 'r').read() - files = yaml.full_load(config_file) + files = json.load(open('file-import.json', 'r')) src_dir = os.path.abspath(LWIP_UPSTREAM_DIR) print("Files Imported:") for f in files['files-to-import']: diff --git a/lwip.py b/lwip.py index b97d273..e63f4e6 100644 --- a/lwip.py +++ b/lwip.py @@ -26,7 +26,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from rtems_waf import rtems -import yaml +import json import os xilinx_drv_incl = '' @@ -66,8 +66,8 @@ def build(bld): arch_lib_path = rtems.arch_bsp_lib_path(bld.env.RTEMS_VERSION, bld.env.RTEMS_ARCH_BSP) - with open('file-import.yaml', 'r') as cf: - files = yaml.full_load(cf.read()) + with open('file-import.json', 'r') as cf: + files = json.load(cf) for f in files['files-to-import']: if f[-2:] == '.c': source_files.append(os.path.join('./lwip', f)) -- cgit v1.2.3