[PATCH rtems-lwip] lwip: Split sources into origin directories

Kinsey Moore kinsey.moore at oarcorp.com
Thu Apr 14 17:32:14 UTC 2022


Moving forward, each origin directory should have its own top-level
COPYING.origin file to describe its license as well as a ORIGIN.origin
file to describe where the code is sourced from.
---
 COPYING.lwip                                  | 25 ++++++++++++++
 COPYING.uLan                                  | 33 +++++++++++++++++++
 ORIGIN.lwip                                   |  2 ++
 ORIGIN.uLan                                   |  2 ++
 README                                        | 14 ++++++++
 lwip.py                                       | 10 +++---
 .../ports/driver/tms570_emac}/eth_lwip.c      |  0
 .../ports/driver/tms570_emac}/eth_lwip.h      |  0
 .../driver/tms570_emac}/eth_lwip_default.h    |  0
 .../ports/driver/tms570_emac}/phy_dp83848h.c  |  0
 .../ports/driver/tms570_emac}/phy_dp83848h.h  |  0
 .../ports/driver/tms570_emac}/ti_drv_emac.h   |  0
 .../ports/driver/tms570_emac}/ti_drv_mdio.h   |  0
 .../ports/driver/tms570_emac}/tms570_emac.h   |  0
 .../ports/driver/tms570_emac}/tms570_netif.c  |  0
 .../ports/driver/tms570_emac}/tms570_netif.h  |  0
 {lwip => uLan}/ports/os/lwipopts.h            |  0
 {lwip => uLan}/ports/os/rtems/arch/cc.h       |  0
 {lwip => uLan}/ports/os/rtems/arch/perf.h     |  0
 {lwip => uLan}/ports/os/rtems/arch/sys_arch.c |  0
 {lwip => uLan}/ports/os/rtems/arch/sys_arch.h |  0
 21 files changed, 81 insertions(+), 5 deletions(-)
 create mode 100644 COPYING.lwip
 create mode 100644 COPYING.uLan
 create mode 100644 ORIGIN.lwip
 create mode 100644 ORIGIN.uLan
 create mode 100644 README
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/eth_lwip.c (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/eth_lwip.h (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/eth_lwip_default.h (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/phy_dp83848h.c (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/phy_dp83848h.h (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/ti_drv_emac.h (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/ti_drv_mdio.h (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/tms570_emac.h (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/tms570_netif.c (100%)
 rename {lwip/ports/drivers => uLan/ports/driver/tms570_emac}/tms570_netif.h (100%)
 rename {lwip => uLan}/ports/os/lwipopts.h (100%)
 rename {lwip => uLan}/ports/os/rtems/arch/cc.h (100%)
 rename {lwip => uLan}/ports/os/rtems/arch/perf.h (100%)
 rename {lwip => uLan}/ports/os/rtems/arch/sys_arch.c (100%)
 rename {lwip => uLan}/ports/os/rtems/arch/sys_arch.h (100%)

diff --git a/COPYING.lwip b/COPYING.lwip
new file mode 100644
index 0000000..90465f5
--- /dev/null
+++ b/COPYING.lwip
@@ -0,0 +1,25 @@
+Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGE.
+
diff --git a/COPYING.uLan b/COPYING.uLan
new file mode 100644
index 0000000..e23898b
--- /dev/null
+++ b/COPYING.uLan
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ * 
+ * Author: Adam Dunkels <adam at sics.se>
+ *
+ */
+
+
diff --git a/ORIGIN.lwip b/ORIGIN.lwip
new file mode 100644
index 0000000..c77755e
--- /dev/null
+++ b/ORIGIN.lwip
@@ -0,0 +1,2 @@
+The files under the lwip/ directory are sourced from:
+git://git.savannah.gnu.org/lwip.git
diff --git a/ORIGIN.uLan b/ORIGIN.uLan
new file mode 100644
index 0000000..8111d3d
--- /dev/null
+++ b/ORIGIN.uLan
@@ -0,0 +1,2 @@
+The files under the uLan/ directory are sourced from:
+git://git.code.sf.net/p/ulan/lwip-omk ulan-lwip-omk
diff --git a/README b/README
new file mode 100644
index 0000000..91e42ae
--- /dev/null
+++ b/README
@@ -0,0 +1,14 @@
+Overview
+--------
+
+The rtems-lwip repository serves as a central location to manage integration of
+lwIP with RTEMS in a more user-accessible manner and to provide a repository of
+network drivers for RTEMS BSPs.
+
+File Origins
+------------
+
+The sources presented here originate in one of several locations described by
+the ORIGIN.* files and whose license is described by the COPYING.* files.
+Commits adding such files should include the hash of the target repository if
+applicable.
diff --git a/lwip.py b/lwip.py
index a3eb7cb..848ff16 100644
--- a/lwip.py
+++ b/lwip.py
@@ -42,10 +42,10 @@ def build(bld):
             if f[-2:] == '.c':
                 source_files.append(os.path.join('./lwip', f))
         
-        for f in os.listdir('./lwip/ports/drivers'):
+        for f in os.listdir('./uLan/ports/driver/tms570_emac'):
             if f[-2:] == '.c':
-                driver_source.append(os.path.join('./lwip/ports/drivers', f))
-    source_files.append('./lwip/ports/os/rtems/arch/sys_arch.c')
+                driver_source.append(os.path.join('./uLan/ports/driver/tms570_emac', f))
+    source_files.append('./uLan/ports/os/rtems/arch/sys_arch.c')
     
     #source_files.append('./lwip/ports/port/sys_arch.c')
     #source_files.append('./lwip/ports/port/perf.c')
@@ -57,7 +57,7 @@ def build(bld):
 
     bld(features ='c',
         target='lwip_obj',
-        includes='./include ./lwip/src/include lwip/ports/port/include ./lwip/ports/os ./lwip/ports/drivers ./lwip/ports/os/rtems',
+        includes='./include ./lwip/src/include ./uLan/ports/os ./uLan/ports/driver/tms570_emac ./uLan/ports/os/rtems',
         source=source_files,
         )
 #    bld(features ='c',
@@ -74,4 +74,4 @@ def build(bld):
                 source='./lwip/test/sample_app.c',
                 use='lwip',
                 lib=['rtemscpu', 'rtemsbsp', 'rtemstest', 'lwip'],
-                includes='./include ./lwip/ports/os/rtems ./lwip/ports/os ./lwip/src/include ./lwip/ports/os/rtems ./lwip/test/' + os.path.relpath(os.path.join(arch_lib_path,'include')))
+                includes='./include ./uLan/ports/os/rtems ./uLan/ports/os ./lwip/src/include ./uLan/ports/os/rtems ./lwip/test/' + os.path.relpath(os.path.join(arch_lib_path,'include')))
diff --git a/lwip/ports/drivers/eth_lwip.c b/uLan/ports/driver/tms570_emac/eth_lwip.c
similarity index 100%
rename from lwip/ports/drivers/eth_lwip.c
rename to uLan/ports/driver/tms570_emac/eth_lwip.c
diff --git a/lwip/ports/drivers/eth_lwip.h b/uLan/ports/driver/tms570_emac/eth_lwip.h
similarity index 100%
rename from lwip/ports/drivers/eth_lwip.h
rename to uLan/ports/driver/tms570_emac/eth_lwip.h
diff --git a/lwip/ports/drivers/eth_lwip_default.h b/uLan/ports/driver/tms570_emac/eth_lwip_default.h
similarity index 100%
rename from lwip/ports/drivers/eth_lwip_default.h
rename to uLan/ports/driver/tms570_emac/eth_lwip_default.h
diff --git a/lwip/ports/drivers/phy_dp83848h.c b/uLan/ports/driver/tms570_emac/phy_dp83848h.c
similarity index 100%
rename from lwip/ports/drivers/phy_dp83848h.c
rename to uLan/ports/driver/tms570_emac/phy_dp83848h.c
diff --git a/lwip/ports/drivers/phy_dp83848h.h b/uLan/ports/driver/tms570_emac/phy_dp83848h.h
similarity index 100%
rename from lwip/ports/drivers/phy_dp83848h.h
rename to uLan/ports/driver/tms570_emac/phy_dp83848h.h
diff --git a/lwip/ports/drivers/ti_drv_emac.h b/uLan/ports/driver/tms570_emac/ti_drv_emac.h
similarity index 100%
rename from lwip/ports/drivers/ti_drv_emac.h
rename to uLan/ports/driver/tms570_emac/ti_drv_emac.h
diff --git a/lwip/ports/drivers/ti_drv_mdio.h b/uLan/ports/driver/tms570_emac/ti_drv_mdio.h
similarity index 100%
rename from lwip/ports/drivers/ti_drv_mdio.h
rename to uLan/ports/driver/tms570_emac/ti_drv_mdio.h
diff --git a/lwip/ports/drivers/tms570_emac.h b/uLan/ports/driver/tms570_emac/tms570_emac.h
similarity index 100%
rename from lwip/ports/drivers/tms570_emac.h
rename to uLan/ports/driver/tms570_emac/tms570_emac.h
diff --git a/lwip/ports/drivers/tms570_netif.c b/uLan/ports/driver/tms570_emac/tms570_netif.c
similarity index 100%
rename from lwip/ports/drivers/tms570_netif.c
rename to uLan/ports/driver/tms570_emac/tms570_netif.c
diff --git a/lwip/ports/drivers/tms570_netif.h b/uLan/ports/driver/tms570_emac/tms570_netif.h
similarity index 100%
rename from lwip/ports/drivers/tms570_netif.h
rename to uLan/ports/driver/tms570_emac/tms570_netif.h
diff --git a/lwip/ports/os/lwipopts.h b/uLan/ports/os/lwipopts.h
similarity index 100%
rename from lwip/ports/os/lwipopts.h
rename to uLan/ports/os/lwipopts.h
diff --git a/lwip/ports/os/rtems/arch/cc.h b/uLan/ports/os/rtems/arch/cc.h
similarity index 100%
rename from lwip/ports/os/rtems/arch/cc.h
rename to uLan/ports/os/rtems/arch/cc.h
diff --git a/lwip/ports/os/rtems/arch/perf.h b/uLan/ports/os/rtems/arch/perf.h
similarity index 100%
rename from lwip/ports/os/rtems/arch/perf.h
rename to uLan/ports/os/rtems/arch/perf.h
diff --git a/lwip/ports/os/rtems/arch/sys_arch.c b/uLan/ports/os/rtems/arch/sys_arch.c
similarity index 100%
rename from lwip/ports/os/rtems/arch/sys_arch.c
rename to uLan/ports/os/rtems/arch/sys_arch.c
diff --git a/lwip/ports/os/rtems/arch/sys_arch.h b/uLan/ports/os/rtems/arch/sys_arch.h
similarity index 100%
rename from lwip/ports/os/rtems/arch/sys_arch.h
rename to uLan/ports/os/rtems/arch/sys_arch.h
-- 
2.30.2



More information about the devel mailing list