From c43f6ed97544191ca804a8885caa3af8906e7f65 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Wed, 16 Oct 2024 18:55:00 -0400 Subject: [PATCH 01/13] Move optional steps for testing VMs out of README.md file This may help avoid new users being confused that they must follow those instructions. Signed-off-by: Andy Fingerhut --- vm-ubuntu-20.04/README.md | 217 +--------------- vm-ubuntu-20.04/create-vm-image-for-others.md | 210 ++++++++++++++++ vm-ubuntu-24.04/README.md | 235 +----------------- vm-ubuntu-24.04/create-vm-image-for-others.md | 214 ++++++++++++++++ 4 files changed, 435 insertions(+), 441 deletions(-) create mode 100644 vm-ubuntu-20.04/create-vm-image-for-others.md create mode 100644 vm-ubuntu-24.04/create-vm-image-for-others.md diff --git a/vm-ubuntu-20.04/README.md b/vm-ubuntu-20.04/README.md index ade3084c..6a1eb7ff 100644 --- a/vm-ubuntu-20.04/README.md +++ b/vm-ubuntu-20.04/README.md @@ -1,10 +1,12 @@ # Creating the VM + + Below are the steps to create a brand new VM using Vagrant: + Install [Vagrant](https://developer.hashicorp.com/vagrant/docs/installation) on your system if it's not already installed. - + Navigate to the directory where you want to create the new VM. + + In a shell/terminal window, change to this `vm-ubuntu-20.04` + directory inside the `tutorials` directory. + Run the below command in the terminal. - ``` + ```bash vagrant up ``` @@ -13,214 +15,9 @@ - You can update these packages using `apt upgrade` within the VM. + Alternatively, a development VM can be created by running - ``` + ```bash vagrant up dev ``` -*Note* : that creating a development VM can take one to several -hours, depending upon the speed of your computer and Internet -connection. - -Below are steps that were performed _after_ one of the commands above -was run on the host OS, before creating the VM images. Some of these -steps could probably be automated with programs, and changes to the -`vagrant` scripts that can do so are welcome. I performed these steps -manually to create a VM image, simply to avoid the experimentation and -time required to automate them. I typically only create new VM images -once per month. - -+ Log in as user p4 (password p4) -+ Click "Upgrade" in the pop-up window asking if you want to upgrade - the system, if asked. This will download the latest Linux kernel - version released for Ubuntu 20.04, and other updated packages. -+ Reboot the system. -+ This is optional, but if you want to save a little disk space, use - - ``` - sudo apt purge - ``` - - to remove older version of Linux - kernel, if the upgrade installed a newer one. -+ Clean the local repository of retrieved package files to free up disk space - - ``` - sudo apt clean - ``` - -+ Log in as user p4 (password p4) -+ Start menu -> Preferences -> LXQt settings -> Monitor settings - + Change resolution from initial 800x600 to 1024x768. Apply the changes. - + Close monitor settings window - + *Note*: For some reason I do not know, these settings seem to be - undone, even if I use the "Save" button. They are temporarily in - effect if I shut down the system and log back in, but then in a few - seconds it switches back to 800x600. Strange. -+ Start menu -> Preferences -> LXQt settings -> Desktop - + In "Wallpaper mode" popup menu, choose "Center on the screen". - + Click Apply button - + Close "Desktop preferences" window -+ Several of the icons on the desktop have an exclamation mark on - them. If you try double-clicking those icons, it pops up a window - saying "This file 'Wireshark' seems to be a desktop entry. What do - you want to do with it?" with buttons for "Open", "Execute", and - "Cancel". Clicking "Execute" executes the associated command. - If you do a mouse middle click on one of these desktop icons, a - popup menu appears where the second-to-bottom choice is "Trust this - executable". Selecting that causes the exclamation mark to go away, - and future double-clicks of the icon execute the program without - first popping up a window to choose between Open/Execute/Cancel. I - did that for each of these desktop icons: - + Terminal - + Wireshark -+ Log off - -+ Log in as user vagrant (password vagrant) -+ Change monitor settings and wallpaper mode as described above for - user p4. -+ Open a terminal. - + Run the command - - ``` - ./clean.sh - ``` - which removes about 6 to 7 GBytes of - files created while building the projects. -+ Log off - - -# Notes on test results for the VM - -I have run the tests below on every VM image I release, before -releasing it. You need not run them again, unless you are curious how -to do so. - - -## p4c testing results - -Steps to run the p4c tests: - -+ Log in as user vagrant (password vagrant) -+ In a new terminal, execute these commands: - -If you are testing on a Release VM image, first get a copy of the p4c -source code using the following command. This is unnecessary with a -Development VM image, as there is already a `p4c` directory with the -version of source code used to create that image already included in -the home directory of the `vagrant` user account: - -```bash -# for Release VM image only -git clone --recursive https://github.com/p4lang/p4c -``` - -The following steps are common for both Release and Development VM -images: - -```bash -# Compile p4c again from source, since the clean.sh step reduced disk -# space by deleting the p4c/build directory. -git clone https://github.com/jafingerhut/p4-guide -cd p4c -~/p4-guide/bin/build-p4c.sh - -# Run the p4c tests -cd build -make -j2 check |& tee make-check-out.txt -``` - -As of 2024-08-01, the p4c compiler passes all of its included tests, -except for some of the p4testgen tests (if those are enabled). - - -## Send ping packets in the solution to `basic` exercise of `p4lang/tutorials` repository - -With the version of the [tutorials](https://github.com/p4lang/tutorials) repository -that comes pre-installed in the `p4` user account of this VM, the -following tests pass. - -First log in as the user `p4` (password `p4`) and open a terminal -window. -```bash -$ cd tutorials/exercises/basic -$ cp solution/basic.p4 basic.p4 -$ make run -``` - -If at the end of many lines of logging output you see a prompt -`mininet>`, you can try entering the command `h1 ping h2` to ping from -virtual host `h1` in the exercise to `h2`, and it should report a -successful ping every second. It will not stop on its own. You can -type Control-C to stop it and return to the `mininet>` prompt, and you -can type Control-D to exit from mininet and get back to the original -shell prompt. To ensure that any processes started by the above steps -are terminated, you can run this command: -```bash -$ make stop -``` - - -# Creating a single file image of the VM - -These notes are primarily here as a reminder for people creating VM -images for distribution. If you downloaded a VM image, these steps -were already performed, and there is no reason you need to perform -them again. - -For the particular case of creating the VM named: - -+ 'P4 Tutorial Development 2024-08-01' -+ created on August 1, 2024 - -here were the host OS details, in case it turns out that matters to -the finished VM image for some reason: - -+ Windows 10 Enterprise -+ VirtualBox 6.1.30 r148432 -+ Vagrant 2.2.18 - -In the VirtualBox GUI interface: - -+ Choose menu item File -> Export Appliance ... -+ Select the VM named 'P4 Tutorial Development 2024-08-01' and click - Continue button - -+ Format - + I used: Open Virtualization Format 1.0 - + Other available options were: - + Open Virtualization Format 0.9 - + Open Virtualization Format 2.0 -+ Target file - + I used: /Users/andy/Documents/P4 Tutorials Development 2024-08-01.ova -+ Mac Address Policy - + I used: Include only NAT network adapter MAC addresses - + Other available options were: - + Include all network adapter MAC addresses - + Strip all network adapter MAC addresses -+ Additionally - + Write Manifest file: checked - + Include ISO image files: unchecked - -Clicked "Continue" button. - -Virtual system settings: - -+ Name: P4 Tutorial 2024-08-01 -+ Product: I left this blank -+ Product-URL: I left this blank -+ Vendor: P4.org - P4 Language Consortium -+ Vendor-URL: https://p4.org -+ Version: 2024-08-01 -+ Description: - -``` -Open source P4 development tools built from latest source code as of 2024-Aug-01 and packaged into an Ubuntu 20.04 Desktop Linux VM for the AMD64 architecture. -``` - -+ License - -``` -Open source code available hosted at https://github.com/p4lang is released under the Apache 2.0 license. Libraries it depends upon, such as Protobuf, Thrift, gRPC, Ubuntu Linux, etc. are released under their own licenses. -``` - -Clicked "Export" button. +*Note* that creating a development VM can take several hours, +depending upon the speed of your computer and Internet connection. diff --git a/vm-ubuntu-20.04/create-vm-image-for-others.md b/vm-ubuntu-20.04/create-vm-image-for-others.md new file mode 100644 index 00000000..6f050d1f --- /dev/null +++ b/vm-ubuntu-20.04/create-vm-image-for-others.md @@ -0,0 +1,210 @@ +# Creating a VM image for distribution to others + +If you want to run `p4c` tests, see the next section on how to do so, +_before_ running the commands in this section, since the commands in +this section will delete files that take one to several hours to +create while compiling p4c, needed for running p4c tests. + +Below are steps that were performed _after_ the commands in the +README.md file were run on the host OS, before creating the VM images. +Some of these steps could probably be automated with programs, and +changes to the `vagrant` scripts that can do so are welcome. I +performed these steps manually to create a VM image, simply to avoid +the experimentation and time required to automate them. I typically +only create new VM images once per month. + ++ Log in as user p4 (password p4) ++ Click "Upgrade" in the pop-up window asking if you want to upgrade + the system, if asked. This will download the latest Linux kernel + version released for Ubuntu 20.04, and other updated packages. ++ Reboot the system. ++ This is optional, but if you want to save a little disk space, use + + ``` + sudo apt purge + ``` + + to remove older version of Linux + kernel, if the upgrade installed a newer one. ++ Clean the local repository of retrieved package files to free up disk space + + ``` + sudo apt clean + ``` + ++ Log in as user p4 (password p4) ++ Start menu -> Preferences -> LXQt settings -> Monitor settings + + Change resolution from initial 800x600 to 1024x768. Apply the changes. + + Close monitor settings window + + *Note*: For some reason I do not know, these settings seem to be + undone, even if I use the "Save" button. They are temporarily in + effect if I shut down the system and log back in, but then in a few + seconds it switches back to 800x600. Strange. ++ Start menu -> Preferences -> LXQt settings -> Desktop + + In "Wallpaper mode" popup menu, choose "Center on the screen". + + Click Apply button + + Close "Desktop preferences" window ++ Several of the icons on the desktop have an exclamation mark on + them. If you try double-clicking those icons, it pops up a window + saying "This file 'Wireshark' seems to be a desktop entry. What do + you want to do with it?" with buttons for "Open", "Execute", and + "Cancel". Clicking "Execute" executes the associated command. + If you do a mouse middle click on one of these desktop icons, a + popup menu appears where the second-to-bottom choice is "Trust this + executable". Selecting that causes the exclamation mark to go away, + and future double-clicks of the icon execute the program without + first popping up a window to choose between Open/Execute/Cancel. I + did that for each of these desktop icons: + + Terminal + + Wireshark ++ Log off + ++ Log in as user vagrant (password vagrant) ++ Change monitor settings and wallpaper mode as described above for + user p4. ++ Open a terminal. + + Run the command + + ``` + ./clean.sh + ``` + which removes about 6 to 7 GBytes of + files created while building the projects. ++ Log off + + +# Notes on test results for the VM + +I have run the tests below on every VM image I release, before +releasing it. You need not run them again, unless you are curious how +to do so. + + +## p4c testing results + +Steps to run the p4c tests: + ++ Log in as user vagrant (password vagrant) ++ In a new terminal, execute these commands: + +If you are testing on a Release VM image, first get a copy of the p4c +source code using the following command. This is unnecessary with a +Development VM image, as there is already a `p4c` directory with the +version of source code used to create that image already included in +the home directory of the `vagrant` user account: + +```bash +# for Release VM image only +git clone --recursive https://github.com/p4lang/p4c +``` + +The following steps are common for both Release and Development VM +images: + +```bash +# Compile p4c again from source, since the clean.sh step reduced disk +# space by deleting the p4c/build directory. +git clone https://github.com/jafingerhut/p4-guide +cd p4c +~/p4-guide/bin/build-p4c.sh + +# Run the p4c tests +cd build +make -j2 check |& tee make-check-out.txt +``` + +As of 2024-08-01, the p4c compiler passes all of its included tests, +except for some of the p4testgen tests (if those are enabled). + + +## Send ping packets in the solution to `basic` exercise of `p4lang/tutorials` repository + +With the version of the [tutorials](https://github.com/p4lang/tutorials) repository +that comes pre-installed in the `p4` user account of this VM, the +following tests pass. + +First log in as the user `p4` (password `p4`) and open a terminal +window. +```bash +$ cd tutorials/exercises/basic +$ cp solution/basic.p4 basic.p4 +$ make run +``` + +If at the end of many lines of logging output you see a prompt +`mininet>`, you can try entering the command `h1 ping h2` to ping from +virtual host `h1` in the exercise to `h2`, and it should report a +successful ping every second. It will not stop on its own. You can +type Control-C to stop it and return to the `mininet>` prompt, and you +can type Control-D to exit from mininet and get back to the original +shell prompt. To ensure that any processes started by the above steps +are terminated, you can run this command: +```bash +$ make stop +``` + + +# Creating a single file image of the VM + +These notes are primarily here as a reminder for people creating VM +images for distribution. If you downloaded a VM image, these steps +were already performed, and there is no reason you need to perform +them again. + +For the particular case of creating the VM named: + ++ 'P4 Tutorial Development 2024-08-01' ++ created on August 1, 2024 + +here were the host OS details, in case it turns out that matters to +the finished VM image for some reason: + ++ Windows 10 Enterprise ++ VirtualBox 6.1.30 r148432 ++ Vagrant 2.2.18 + +In the VirtualBox GUI interface: + ++ Choose menu item File -> Export Appliance ... ++ Select the VM named 'P4 Tutorial Development 2024-08-01' and click + Continue button + ++ Format + + I used: Open Virtualization Format 1.0 + + Other available options were: + + Open Virtualization Format 0.9 + + Open Virtualization Format 2.0 ++ Target file + + I used: /Users/andy/Documents/P4 Tutorials Development 2024-08-01.ova ++ Mac Address Policy + + I used: Include only NAT network adapter MAC addresses + + Other available options were: + + Include all network adapter MAC addresses + + Strip all network adapter MAC addresses ++ Additionally + + Write Manifest file: checked + + Include ISO image files: unchecked + +Clicked "Continue" button. + +Virtual system settings: + ++ Name: P4 Tutorial 2024-08-01 ++ Product: I left this blank ++ Product-URL: I left this blank ++ Vendor: P4.org - P4 Language Consortium ++ Vendor-URL: https://p4.org ++ Version: 2024-08-01 ++ Description: + +``` +Open source P4 development tools built from latest source code as of 2024-Aug-01 and packaged into an Ubuntu 20.04 Desktop Linux VM for the AMD64 architecture. +``` + ++ License + +``` +Open source code available hosted at https://github.com/p4lang is released under the Apache 2.0 license. Libraries it depends upon, such as Protobuf, Thrift, gRPC, Ubuntu Linux, etc. are released under their own licenses. +``` + +Clicked "Export" button. diff --git a/vm-ubuntu-24.04/README.md b/vm-ubuntu-24.04/README.md index 31466a58..9a2fb11c 100644 --- a/vm-ubuntu-24.04/README.md +++ b/vm-ubuntu-24.04/README.md @@ -1,10 +1,7 @@ # Introduction -This directory is still new and a bit experimental at this point. -Feel free to try it out and report problems if you find any. - -Known issues that anyone who knows how to fix is welcome to suggest -improvements: +Known minor issues that anyone who knows how to fix is welcome to +suggest improvements: + The desktop icon for the Wireshark application does not seem to exist, at least not under the name that worked for Ubuntu 20.04, so @@ -15,7 +12,8 @@ improvements: + Below are the steps to create a brand new VM using Vagrant: + Install [Vagrant](https://developer.hashicorp.com/vagrant/docs/installation) on your system if it's not already installed. - + Navigate to the directory where you want to create the new VM. + + In a shell/terminal window, change to this `vm-ubuntu-24.04` + directory inside the `tutorials` directory. + Run the below command in the terminal. ```bash @@ -30,228 +28,3 @@ improvements: *Note* that creating a development VM can take several hours, depending upon the speed of your computer and Internet connection. - - -# Creating a VM image for distribution to others - -If you are creating the VM for your own use, there is no need to read -further below. All later instructions are for those who wish to -create a VM image for others to download and use. - -Some of these steps could probably be automated with programs, and -changes to the `vagrant` scripts that can do so are welcome. I -perform these steps manually to create a VM image, simply to avoid the -experimentation and time required to automate them. I typically only -create new VM images once per month. - -+ Log in as user p4 (password p4) -+ Upgrade Ubuntu packages if newer ones are available: - - ```bash - sudo apt update - sudo apt upgrade - ``` - -+ Reboot the system. -+ This is optional, but if you want to save a little disk space, use - - ```bash - sudo apt purge - ``` - - to remove older version of Linux - kernel, if the upgrade installed a newer one. -+ Clean the local repository of retrieved package files to free up disk space - - ```bash - sudo apt clean - ``` - -+ Log in as user p4 (password p4) -+ Start menu -> Preferences -> LXQt settings -> Monitor settings - + Change resolution from initial 800x600 to 1024x768. Apply the changes. - + Close monitor settings window - + *Note*: For some reason I do not know, these settings seem to be - undone, even if I use the "Save" button. They are temporarily in - effect if I shut down the system and log back in, but then in a few - seconds it switches back to 800x600. Strange. -+ Start menu -> Preferences -> LXQt settings -> Desktop - + Click "Background" tab - + To the right of "Wallpaper image file" name, click "Browse" - button. Find and choose "lxqt-default-wallpaper.png" from the - list and click "Open". - + In "Wallpaper mode" popup menu, choose "Center on the screen". - + Click Apply button - + Close "Desktop preferences" window -+ Start menu -> Preferences -> LXQt settings -> Appearance - + Click "Icons Theme" in left column - + Click "Ubuntu-Mono-Light ..." in right column. - + Click "Apply" button, then "Close" button. -+ Several of the icons on the desktop have an exclamation mark on - them. If you try double-clicking those icons, it pops up a window - saying "This file 'Wireshark' seems to be a desktop entry. What do - you want to do with it?" with buttons for "Open", "Execute", and - "Cancel". Clicking "Execute" executes the associated command. - If you do a mouse middle click on one of these desktop icons, a - popup menu appears where the second-to-bottom choice is "Trust this - executable". Selecting that causes the exclamation mark to go away, - and future double-clicks of the icon execute the program without - first popping up a window to choose between Open/Execute/Cancel. I - did that for each of these desktop icons: - + Terminal - + Wireshark -+ Log off - -+ Log in as user vagrant (password vagrant) -+ Change monitor settings and wallpaper mode as described above for - user p4. -+ Open a terminal. - + Run the command - - ```bash - ./clean.sh - ``` - which removes about 6 to 7 GBytes of - files created while building the projects. -+ Log off - - -# Notes on test results for the VM - -I have run the tests below on every VM image I release, before -releasing it. You need not run them again, unless you are curious how -to do so. - - -## p4c testing results - -Steps to run the p4c tests: - -+ Log in as user vagrant (password vagrant) -+ In a new terminal, execute these commands: - -If you are testing on a Release VM image, first get a copy of the p4c -source code using the following command. This is unnecessary with a -Development VM image, as there is already a `p4c` directory with the -version of source code used to create that image already included in -the home directory of the `vagrant` user account: - -```bash -# for Release VM image only -git clone --recursive https://github.com/p4lang/p4c -``` - -The following steps are common for both Release and Development VM -images: - -```bash -# Compile p4c again from source, since the clean.sh step reduced disk -# space by deleting the p4c/build directory. -git clone https://github.com/jafingerhut/p4-guide -cd p4c -~/p4-guide/bin/build-p4c.sh - -# Run the p4c tests -cd build -make -j2 check |& tee out1.txt - -# The above fails about 500 tests that require root. Re-run those tests -# as root using the next command. -sudo PATH=${PATH} VIRTUAL_ENV=${VIRTUAL_ENV} ${P4GUIDE_SUDO_OPTS} make -j2 recheck |& tee out2.txt -``` - -As of 2024-08-01, the p4c compiler passes all but about 15 of its -included tests when built using the steps above. - - -## Send ping packets in the solution to `basic` exercise of `p4lang/tutorials` repository - -With the version of the [tutorials](https://github.com/p4lang/tutorials) repository -that comes pre-installed in the `p4` user account of this VM, the -following tests pass. - -First log in as the user `p4` (password `p4`) and open a terminal -window. -```bash -$ cd tutorials/exercises/basic -$ cp solution/basic.p4 basic.p4 -$ make run -``` - -If at the end of many lines of logging output you see a prompt -`mininet>`, you can try entering the command `h1 ping h2` to ping from -virtual host `h1` in the exercise to `h2`, and it should report a -successful ping every second. It will not stop on its own. You can -type Control-C to stop it and return to the `mininet>` prompt, and you -can type Control-D to exit from mininet and get back to the original -shell prompt. To ensure that any processes started by the above steps -are terminated, you can run this command: -```bash -$ make stop -``` - - -# Creating a single file image of the VM - -These notes are primarily here as a reminder for people creating VM -images for distribution. If you downloaded a VM image, these steps -were already performed, and there is no reason you need to perform -them again. - -For the particular case of creating the VM named: - -+ 'P4 Tutorial Development 2024-08-01' -+ created on August 1, 2024 - -here were the host OS details, in case it turns out that matters to -the finished VM image for some reason: - -+ Windows 10 Enterprise -+ VirtualBox 6.1.30 r148432 -+ Vagrant 2.2.18 - -In the VirtualBox GUI interface: - -+ Choose menu item File -> Export Appliance ... -+ Select the VM named 'P4 Tutorial Development 2024-08-01' and click - Continue button - -+ Format - + I used: Open Virtualization Format 1.0 - + Other available options were: - + Open Virtualization Format 0.9 - + Open Virtualization Format 2.0 -+ Target file - + I used: /Users/andy/Documents/P4 Tutorials Development 2024-08-01.ova -+ Mac Address Policy - + I used: Include only NAT network adapter MAC addresses - + Other available options were: - + Include all network adapter MAC addresses - + Strip all network adapter MAC addresses -+ Additionally - + Write Manifest file: checked - + Include ISO image files: unchecked - -Clicked "Continue" button. - -Virtual system settings: - -+ Name: P4 Tutorial 2024-08-01 -+ Product: I left this blank -+ Product-URL: I left this blank -+ Vendor: P4.org - P4 Language Consortium -+ Vendor-URL: https://p4.org -+ Version: 2024-08-01 -+ Description: - -``` -Open source P4 development tools built from latest source code as of 2024-Aug-01 and packaged into an Ubuntu 24.04 Desktop Linux VM for the AMD64 architecture. -``` - -+ License - -``` -Open source code available hosted at https://github.com/p4lang is released under the Apache 2.0 license. Libraries it depends upon, such as Protobuf, Thrift, gRPC, Ubuntu Linux, etc. are released under their own licenses. -``` - -Clicked "Export" button. diff --git a/vm-ubuntu-24.04/create-vm-image-for-others.md b/vm-ubuntu-24.04/create-vm-image-for-others.md new file mode 100644 index 00000000..2e38ca84 --- /dev/null +++ b/vm-ubuntu-24.04/create-vm-image-for-others.md @@ -0,0 +1,214 @@ +# Creating a VM image for distribution to others + +If you want to run `p4c` tests, see the next section on how to do so, +_before_ running the commands in this section, since the commands in +this section will delete files that take one to several hours to +create while compiling p4c, needed for running p4c tests. + +If you are creating the VM for your own use, there is no need to read +further below. All later instructions are for those who wish to +create a VM image for others to download and use. + +Some of these steps could probably be automated with programs, and +changes to the `vagrant` scripts that can do so are welcome. I +perform these steps manually to create a VM image, simply to avoid the +experimentation and time required to automate them. I typically only +create new VM images once per month. + ++ Log in as user p4 (password p4) ++ Upgrade Ubuntu packages if newer ones are available: + + ```bash + sudo apt update + sudo apt upgrade + ``` + ++ Reboot the system. ++ This is optional, but if you want to save a little disk space, use + + ```bash + sudo apt purge + ``` + + to remove older version of Linux + kernel, if the upgrade installed a newer one. ++ Clean the local repository of retrieved package files to free up disk space + + ```bash + sudo apt clean + ``` + ++ Log in as user p4 (password p4) ++ Start menu -> Preferences -> LXQt settings -> Monitor settings + + Change resolution from initial 800x600 to 1024x768. Apply the changes. + + Close monitor settings window + + *Note*: For some reason I do not know, these settings seem to be + undone, even if I use the "Save" button. They are temporarily in + effect if I shut down the system and log back in, but then in a few + seconds it switches back to 800x600. Strange. ++ Start menu -> Preferences -> LXQt settings -> Desktop + + Click "Background" tab + + To the right of "Wallpaper image file" name, click "Browse" + button. Find and choose "lxqt-default-wallpaper.png" from the + list and click "Open". + + In "Wallpaper mode" popup menu, choose "Center on the screen". + + Click Apply button + + Close "Desktop preferences" window ++ Start menu -> Preferences -> LXQt settings -> Appearance + + Click "Icons Theme" in left column + + Click "Ubuntu-Mono-Light ..." in right column. + + Click "Apply" button, then "Close" button. ++ Several of the icons on the desktop have an exclamation mark on + them. If you try double-clicking those icons, it pops up a window + saying "This file 'Wireshark' seems to be a desktop entry. What do + you want to do with it?" with buttons for "Open", "Execute", and + "Cancel". Clicking "Execute" executes the associated command. + If you do a mouse middle click on one of these desktop icons, a + popup menu appears where the second-to-bottom choice is "Trust this + executable". Selecting that causes the exclamation mark to go away, + and future double-clicks of the icon execute the program without + first popping up a window to choose between Open/Execute/Cancel. I + did that for each of these desktop icons: + + Terminal + + Wireshark ++ Log off + ++ Log in as user vagrant (password vagrant) ++ Change monitor settings and wallpaper mode as described above for + user p4. ++ Open a terminal. + + Run the command + + ```bash + ./clean.sh + ``` + which removes about 6 to 7 GBytes of + files created while building the projects. ++ Log off + + +# Notes on test results for the VM + +I have run the tests below on every VM image I release, before +releasing it. You need not run them again, unless you are curious how +to do so. + + +## p4c testing results + +Steps to run the p4c tests: + ++ Log in as user vagrant (password vagrant) ++ In a new terminal, execute these commands: + +```bash +# Compile p4c again from source, since the clean.sh step reduced disk +# space by deleting the p4c/build directory. +git clone https://github.com/jafingerhut/p4-guide +cd p4c +~/p4-guide/bin/build-p4c.sh + +# Run the p4c tests +cd build +make -j2 check |& tee out1.txt + +# The above fails about 500 tests that require root. Re-run those tests +# as root using the next command. +sudo PATH=${PATH} VIRTUAL_ENV=${VIRTUAL_ENV} ${P4GUIDE_SUDO_OPTS} make -j2 recheck |& tee out2.txt +``` + +As of 2024-08-01, the p4c compiler passes all but about 15 of its +included tests when built using the steps above. + + +## Send ping packets in the solution to `basic` exercise of `p4lang/tutorials` repository + +With the version of the [tutorials](https://github.com/p4lang/tutorials) repository +that comes pre-installed in the `p4` user account of this VM, the +following tests pass. + +First log in as the user `p4` (password `p4`) and open a terminal +window. +```bash +$ cd tutorials/exercises/basic +$ cp solution/basic.p4 basic.p4 +$ make run +``` + +If at the end of many lines of logging output you see a prompt +`mininet>`, you can try entering the command `h1 ping h2` to ping from +virtual host `h1` in the exercise to `h2`, and it should report a +successful ping every second. It will not stop on its own. You can +type Control-C to stop it and return to the `mininet>` prompt, and you +can type Control-D to exit from mininet and get back to the original +shell prompt. To ensure that any processes started by the above steps +are terminated, you can run this command: +```bash +$ make stop +``` + + +# Creating a single file image of the VM + +These notes are primarily here as a reminder for people creating VM +images for distribution. If you downloaded a VM image, these steps +were already performed, and there is no reason you need to perform +them again. + +For the particular case of creating the VM named: + ++ 'P4 Tutorial Development 2024-08-01' ++ created on August 1, 2024 + +here were the host OS details, in case it turns out that matters to +the finished VM image for some reason: + ++ Windows 10 Enterprise ++ VirtualBox 6.1.30 r148432 ++ Vagrant 2.2.18 + +In the VirtualBox GUI interface: + ++ Choose menu item File -> Export Appliance ... ++ Select the VM named 'P4 Tutorial Development 2024-08-01' and click + Continue button + ++ Format + + I used: Open Virtualization Format 1.0 + + Other available options were: + + Open Virtualization Format 0.9 + + Open Virtualization Format 2.0 ++ Target file + + I used: /Users/andy/Documents/P4 Tutorials Development 2024-08-01.ova ++ Mac Address Policy + + I used: Include only NAT network adapter MAC addresses + + Other available options were: + + Include all network adapter MAC addresses + + Strip all network adapter MAC addresses ++ Additionally + + Write Manifest file: checked + + Include ISO image files: unchecked + +Clicked "Continue" button. + +Virtual system settings: + ++ Name: P4 Tutorial 2024-08-01 ++ Product: I left this blank ++ Product-URL: I left this blank ++ Vendor: P4.org - P4 Language Consortium ++ Vendor-URL: https://p4.org ++ Version: 2024-08-01 ++ Description: + +``` +Open source P4 development tools built from latest source code as of 2024-Aug-01 and packaged into an Ubuntu 24.04 Desktop Linux VM for the AMD64 architecture. +``` + ++ License + +``` +Open source code available hosted at https://github.com/p4lang is released under the Apache 2.0 license. Libraries it depends upon, such as Protobuf, Thrift, gRPC, Ubuntu Linux, etc. are released under their own licenses. +``` + +Clicked "Export" button. From 322494984d045d085562715f3e7fb3fece7ff1d5 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Thu, 30 Jan 2025 21:17:19 +0000 Subject: [PATCH 02/13] Add 2025-Jan-30 versions of source code for install.sh Signed-off-by: Andy Fingerhut --- vm-ubuntu-24.04/install.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/vm-ubuntu-24.04/install.sh b/vm-ubuntu-24.04/install.sh index ccc7728f..a7eae56b 100755 --- a/vm-ubuntu-24.04/install.sh +++ b/vm-ubuntu-24.04/install.sh @@ -27,11 +27,12 @@ print_usage() { 1>&2 echo "" 1>&2 echo "Dates supported:" 1>&2 echo " 2025-Jan-01" + 1>&2 echo " 2025-Jan-30" } if [ $# -eq 0 ] then - VERSION="2025-Jan-01" + VERSION="2025-Jan-30" echo "No version specified. Defaulting to ${VERSION}" elif [ $# -eq 1 ] then @@ -49,6 +50,13 @@ case ${VERSION} in export INSTALL_P4C_SOURCE_VERSION="1dc0afae2207f4bb9f5ab45f105ed569cc1ac89b" export INSTALL_PTF_SOURCE_VERSION="c554f83685186be4cfa9387eb5d6d700d2bbd7c0" ;; + 2025-Jan-30) + # 2025-Jan-01 versions: + export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="892c42198082d3252f4c6facc7363c02ca1d71d2" + export INSTALL_PI_SOURCE_VERSION="2bb40f7ab800b91b26f3aed174bbbfc739a37ffa" + export INSTALL_P4C_SOURCE_VERSION="2776b1948529bc7e8ccfb2f6ea2a9c1ab1f68796" + export INSTALL_PTF_SOURCE_VERSION="c554f83685186be4cfa9387eb5d6d700d2bbd7c0" + ;; latest) echo "Using the latest version of all p4lang repository source code." ;; From bc84b21efdd5412fee85a9f44212ada9e4d9c5db Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 14:29:32 +0000 Subject: [PATCH 03/13] Remove early attempt at adding license ids to Markdown files Signed-off-by: Andy Fingerhut --- CONTRIBUTING.md | 2 -- README.md | 3 --- exercises/basic/README.md | 3 --- exercises/basic_tunnel/README.md | 3 --- exercises/calc/README.md | 3 --- exercises/ecn/README.md | 3 --- exercises/firewall/README.md | 3 --- exercises/link_monitor/README.md | 3 --- exercises/load_balance/README.md | 3 --- exercises/mri/README.md | 3 --- exercises/multicast/README.md | 3 --- exercises/p4runtime/README.md | 3 --- exercises/qos/README.md | 3 --- exercises/source_routing/README.md | 3 --- utils/README.md | 3 --- vm-ubuntu-20.04/README.md | 3 --- vm-ubuntu-20.04/create-vm-image-for-others.md | 3 --- .../README-create-vm-using-iso-installer-for-ubuntu-desktop.md | 3 --- .../README-create-vm-using-iso-installer-for-ubuntu-server.md | 3 --- vm-ubuntu-24.04/README-create-vm-using-iso-installer.md | 3 --- vm-ubuntu-24.04/README-create-vm-using-vagrant.md | 3 --- vm-ubuntu-24.04/README.md | 3 --- vm-ubuntu-24.04/create-vm-image-for-others.md | 3 --- vm/README.md | 3 --- 24 files changed, 71 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd412614..b5e0394d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) --- Thank you for your interest in contributing to the P4 Compiler tutorials repository! Your contributions are important and will help to improve the project for everyone. Before you begin, please consider the guidelines below. diff --git a/README.md b/README.md index 223bad96..83ef7fbb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # P4 Tutorial * [Introduction](#introduction) diff --git a/exercises/basic/README.md b/exercises/basic/README.md index 53d26daa..9c71a3d3 100644 --- a/exercises/basic/README.md +++ b/exercises/basic/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing Basic Forwarding ## Introduction diff --git a/exercises/basic_tunnel/README.md b/exercises/basic_tunnel/README.md index 3ffd6985..11014044 100644 --- a/exercises/basic_tunnel/README.md +++ b/exercises/basic_tunnel/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing Basic Tunneling ## Introduction diff --git a/exercises/calc/README.md b/exercises/calc/README.md index af512cec..8a5c8485 100644 --- a/exercises/calc/README.md +++ b/exercises/calc/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing a P4 Calculator ## Introduction diff --git a/exercises/ecn/README.md b/exercises/ecn/README.md index cfd11fe8..ca51a165 100644 --- a/exercises/ecn/README.md +++ b/exercises/ecn/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing ECN ## Introduction diff --git a/exercises/firewall/README.md b/exercises/firewall/README.md index 5afc837e..bec34175 100644 --- a/exercises/firewall/README.md +++ b/exercises/firewall/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing A Basic Stateful Firewall ## Introduction diff --git a/exercises/link_monitor/README.md b/exercises/link_monitor/README.md index 74f2086d..9eff8c6d 100644 --- a/exercises/link_monitor/README.md +++ b/exercises/link_monitor/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing Link Monitoring ## Introduction diff --git a/exercises/load_balance/README.md b/exercises/load_balance/README.md index b56132fb..5dd9c45f 100644 --- a/exercises/load_balance/README.md +++ b/exercises/load_balance/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Load Balancing In this exercise, you will implement a form of load balancing based on diff --git a/exercises/mri/README.md b/exercises/mri/README.md index bd6deffc..73069414 100644 --- a/exercises/mri/README.md +++ b/exercises/mri/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing MRI ## Introduction diff --git a/exercises/multicast/README.md b/exercises/multicast/README.md index 8eeadf2f..3bbec7c3 100644 --- a/exercises/multicast/README.md +++ b/exercises/multicast/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing Multicast ## Introduction diff --git a/exercises/p4runtime/README.md b/exercises/p4runtime/README.md index a180461e..3fa0377f 100644 --- a/exercises/p4runtime/README.md +++ b/exercises/p4runtime/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing a Control Plane using P4Runtime ## Introduction diff --git a/exercises/qos/README.md b/exercises/qos/README.md index f854d399..6eab008f 100644 --- a/exercises/qos/README.md +++ b/exercises/qos/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing QOS ## Introduction diff --git a/exercises/source_routing/README.md b/exercises/source_routing/README.md index 78fb60ef..50774abb 100644 --- a/exercises/source_routing/README.md +++ b/exercises/source_routing/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Implementing Source Routing ## Introduction diff --git a/utils/README.md b/utils/README.md index 2c749f89..fc371f02 100644 --- a/utils/README.md +++ b/utils/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # P4 Utils This folder contains various scripts used to run the code. diff --git a/vm-ubuntu-20.04/README.md b/vm-ubuntu-20.04/README.md index 90b09d93..abe9c949 100644 --- a/vm-ubuntu-20.04/README.md +++ b/vm-ubuntu-20.04/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Creating the VM This directory is here only for historical reference. The scripts diff --git a/vm-ubuntu-20.04/create-vm-image-for-others.md b/vm-ubuntu-20.04/create-vm-image-for-others.md index 7bab42de..d4aeb7f6 100644 --- a/vm-ubuntu-20.04/create-vm-image-for-others.md +++ b/vm-ubuntu-20.04/create-vm-image-for-others.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Creating a VM image for distribution to others If you want to run `p4c` tests, see the next section on how to do so, diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md index 05044822..a88c736a 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md +++ b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Creating a VM using VirtualBox and an ISO disk image with an Ubuntu Desktop Linux 24.04 installer In the initial boot menu, the default choice "Try or Install Ubuntu" diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md index eb5e4852..b72e76f4 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md +++ b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Creating a VM using VirtualBox and an ISO disk image with an Ubuntu Server Linux 24.04 installer In the initial boot menu, the default choice "Try or Install Ubuntu" diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md index 347716db..bf31c609 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md +++ b/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Create VM using ISO installer ## Finding the Linux installer image you want diff --git a/vm-ubuntu-24.04/README-create-vm-using-vagrant.md b/vm-ubuntu-24.04/README-create-vm-using-vagrant.md index 6f1cffae..da437b87 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-vagrant.md +++ b/vm-ubuntu-24.04/README-create-vm-using-vagrant.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - ## Creating the VM using VirtualBox and Vagrant + Install diff --git a/vm-ubuntu-24.04/README.md b/vm-ubuntu-24.04/README.md index 958eecfa..230313de 100644 --- a/vm-ubuntu-24.04/README.md +++ b/vm-ubuntu-24.04/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Introduction Detailed steps are given later to create a new virtual machine (VM) diff --git a/vm-ubuntu-24.04/create-vm-image-for-others.md b/vm-ubuntu-24.04/create-vm-image-for-others.md index 59a5912e..d7fcb883 100644 --- a/vm-ubuntu-24.04/create-vm-image-for-others.md +++ b/vm-ubuntu-24.04/create-vm-image-for-others.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Creating a VM image for distribution to others If you want to run `p4c` tests, see the next section on how to do so, diff --git a/vm/README.md b/vm/README.md index 3f1b51ae..57fe36e9 100644 --- a/vm/README.md +++ b/vm/README.md @@ -1,6 +1,3 @@ - -[comment]: # (SPDX-License-Identifier: Apache-2.0) - # Introduction This directory is here only for historical reference. The scripts From da64ebcde09f7d8875be994d18ddd7adb85dab0a Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 14:31:10 +0000 Subject: [PATCH 04/13] Replace LICENSE file with LICENSES directory Signed-off-by: Andy Fingerhut --- LICENSE | 176 -------------------------------------------------------- 1 file changed, 176 deletions(-) delete mode 100644 LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 187edf86..00000000 --- a/LICENSE +++ /dev/null @@ -1,176 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS From 98fca04fce81c169199c7a6832a10b1428f491eb Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 14:55:13 +0000 Subject: [PATCH 05/13] Use REUSE project to add copyright and license id to all Markdown files Signed-off-by: Andy Fingerhut --- CONTRIBUTING.md | 6 ++++++ README.md | 6 ++++++ doc/licenses.md | 6 ++++++ exercises/basic/README.md | 6 ++++++ exercises/basic_tunnel/README.md | 6 ++++++ exercises/calc/README.md | 6 ++++++ exercises/ecn/README.md | 6 ++++++ exercises/firewall/README.md | 6 ++++++ exercises/link_monitor/README.md | 6 ++++++ exercises/load_balance/README.md | 6 ++++++ exercises/mri/README.md | 6 ++++++ exercises/multicast/README.md | 6 ++++++ exercises/p4runtime/README.md | 6 ++++++ exercises/qos/README.md | 6 ++++++ exercises/source_routing/README.md | 6 ++++++ utils/README.md | 6 ++++++ vm-ubuntu-20.04/README.md | 6 ++++++ vm-ubuntu-20.04/create-vm-image-for-others.md | 6 ++++++ ...ADME-create-vm-using-iso-installer-for-ubuntu-desktop.md | 6 ++++++ ...EADME-create-vm-using-iso-installer-for-ubuntu-server.md | 6 ++++++ vm-ubuntu-24.04/README-create-vm-using-iso-installer.md | 6 ++++++ vm-ubuntu-24.04/README-create-vm-using-vagrant.md | 6 ++++++ vm-ubuntu-24.04/README.md | 6 ++++++ vm-ubuntu-24.04/create-vm-image-for-others.md | 6 ++++++ vm/README.md | 6 ++++++ 25 files changed, 150 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b5e0394d..c250f420 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,9 @@ + + --- Thank you for your interest in contributing to the P4 Compiler tutorials repository! Your contributions are important and will help to improve the project for everyone. Before you begin, please consider the guidelines below. diff --git a/README.md b/README.md index 83ef7fbb..213d5aad 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + # P4 Tutorial * [Introduction](#introduction) diff --git a/doc/licenses.md b/doc/licenses.md index d5457cf0..ca5eba87 100644 --- a/doc/licenses.md +++ b/doc/licenses.md @@ -1,3 +1,9 @@ + + # Introduction The P4 Consortium's strongly recommends that all source files in this diff --git a/exercises/basic/README.md b/exercises/basic/README.md index 9c71a3d3..81445b68 100644 --- a/exercises/basic/README.md +++ b/exercises/basic/README.md @@ -1,3 +1,9 @@ + + # Implementing Basic Forwarding ## Introduction diff --git a/exercises/basic_tunnel/README.md b/exercises/basic_tunnel/README.md index 11014044..eb8b712b 100644 --- a/exercises/basic_tunnel/README.md +++ b/exercises/basic_tunnel/README.md @@ -1,3 +1,9 @@ + + # Implementing Basic Tunneling ## Introduction diff --git a/exercises/calc/README.md b/exercises/calc/README.md index 8a5c8485..0150eeb7 100644 --- a/exercises/calc/README.md +++ b/exercises/calc/README.md @@ -1,3 +1,9 @@ + + # Implementing a P4 Calculator ## Introduction diff --git a/exercises/ecn/README.md b/exercises/ecn/README.md index ca51a165..6f57f897 100644 --- a/exercises/ecn/README.md +++ b/exercises/ecn/README.md @@ -1,3 +1,9 @@ + + # Implementing ECN ## Introduction diff --git a/exercises/firewall/README.md b/exercises/firewall/README.md index bec34175..76a16e13 100644 --- a/exercises/firewall/README.md +++ b/exercises/firewall/README.md @@ -1,3 +1,9 @@ + + # Implementing A Basic Stateful Firewall ## Introduction diff --git a/exercises/link_monitor/README.md b/exercises/link_monitor/README.md index 9eff8c6d..de252ed9 100644 --- a/exercises/link_monitor/README.md +++ b/exercises/link_monitor/README.md @@ -1,3 +1,9 @@ + + # Implementing Link Monitoring ## Introduction diff --git a/exercises/load_balance/README.md b/exercises/load_balance/README.md index 5dd9c45f..f6af4af0 100644 --- a/exercises/load_balance/README.md +++ b/exercises/load_balance/README.md @@ -1,3 +1,9 @@ + + # Load Balancing In this exercise, you will implement a form of load balancing based on diff --git a/exercises/mri/README.md b/exercises/mri/README.md index 73069414..d21fee9f 100644 --- a/exercises/mri/README.md +++ b/exercises/mri/README.md @@ -1,3 +1,9 @@ + + # Implementing MRI ## Introduction diff --git a/exercises/multicast/README.md b/exercises/multicast/README.md index 3bbec7c3..1fae1a72 100644 --- a/exercises/multicast/README.md +++ b/exercises/multicast/README.md @@ -1,3 +1,9 @@ + + # Implementing Multicast ## Introduction diff --git a/exercises/p4runtime/README.md b/exercises/p4runtime/README.md index 3fa0377f..1df40535 100644 --- a/exercises/p4runtime/README.md +++ b/exercises/p4runtime/README.md @@ -1,3 +1,9 @@ + + # Implementing a Control Plane using P4Runtime ## Introduction diff --git a/exercises/qos/README.md b/exercises/qos/README.md index 6eab008f..990201ea 100644 --- a/exercises/qos/README.md +++ b/exercises/qos/README.md @@ -1,3 +1,9 @@ + + # Implementing QOS ## Introduction diff --git a/exercises/source_routing/README.md b/exercises/source_routing/README.md index 50774abb..460f95d0 100644 --- a/exercises/source_routing/README.md +++ b/exercises/source_routing/README.md @@ -1,3 +1,9 @@ + + # Implementing Source Routing ## Introduction diff --git a/utils/README.md b/utils/README.md index fc371f02..39da81b7 100644 --- a/utils/README.md +++ b/utils/README.md @@ -1,3 +1,9 @@ + + # P4 Utils This folder contains various scripts used to run the code. diff --git a/vm-ubuntu-20.04/README.md b/vm-ubuntu-20.04/README.md index abe9c949..4a1fd956 100644 --- a/vm-ubuntu-20.04/README.md +++ b/vm-ubuntu-20.04/README.md @@ -1,3 +1,9 @@ + + # Creating the VM This directory is here only for historical reference. The scripts diff --git a/vm-ubuntu-20.04/create-vm-image-for-others.md b/vm-ubuntu-20.04/create-vm-image-for-others.md index d4aeb7f6..8ef056c8 100644 --- a/vm-ubuntu-20.04/create-vm-image-for-others.md +++ b/vm-ubuntu-20.04/create-vm-image-for-others.md @@ -1,3 +1,9 @@ + + # Creating a VM image for distribution to others If you want to run `p4c` tests, see the next section on how to do so, diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md index a88c736a..4b20357d 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md +++ b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-desktop.md @@ -1,3 +1,9 @@ + + # Creating a VM using VirtualBox and an ISO disk image with an Ubuntu Desktop Linux 24.04 installer In the initial boot menu, the default choice "Try or Install Ubuntu" diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md index b72e76f4..e441e178 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md +++ b/vm-ubuntu-24.04/README-create-vm-using-iso-installer-for-ubuntu-server.md @@ -1,3 +1,9 @@ + + # Creating a VM using VirtualBox and an ISO disk image with an Ubuntu Server Linux 24.04 installer In the initial boot menu, the default choice "Try or Install Ubuntu" diff --git a/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md b/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md index bf31c609..b22fea83 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md +++ b/vm-ubuntu-24.04/README-create-vm-using-iso-installer.md @@ -1,3 +1,9 @@ + + # Create VM using ISO installer ## Finding the Linux installer image you want diff --git a/vm-ubuntu-24.04/README-create-vm-using-vagrant.md b/vm-ubuntu-24.04/README-create-vm-using-vagrant.md index da437b87..bfdad45c 100644 --- a/vm-ubuntu-24.04/README-create-vm-using-vagrant.md +++ b/vm-ubuntu-24.04/README-create-vm-using-vagrant.md @@ -1,3 +1,9 @@ + + ## Creating the VM using VirtualBox and Vagrant + Install diff --git a/vm-ubuntu-24.04/README.md b/vm-ubuntu-24.04/README.md index 230313de..1028dbab 100644 --- a/vm-ubuntu-24.04/README.md +++ b/vm-ubuntu-24.04/README.md @@ -1,3 +1,9 @@ + + # Introduction Detailed steps are given later to create a new virtual machine (VM) diff --git a/vm-ubuntu-24.04/create-vm-image-for-others.md b/vm-ubuntu-24.04/create-vm-image-for-others.md index d7fcb883..7135f917 100644 --- a/vm-ubuntu-24.04/create-vm-image-for-others.md +++ b/vm-ubuntu-24.04/create-vm-image-for-others.md @@ -1,3 +1,9 @@ + + # Creating a VM image for distribution to others If you want to run `p4c` tests, see the next section on how to do so, diff --git a/vm/README.md b/vm/README.md index 57fe36e9..dbdb8428 100644 --- a/vm/README.md +++ b/vm/README.md @@ -1,3 +1,9 @@ + + # Introduction This directory is here only for historical reference. The scripts From 9416958ded66fb99b6540d172cc7bfbd6fe13b70 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 16:12:58 +0000 Subject: [PATCH 06/13] Add LICENSES directory that I neglected to add earlier Signed-off-by: Andy Fingerhut --- LICENSES/Apache-2.0.txt | 73 ++++++++++++++++++++++++ LICENSES/GPL-2.0-only.txt | 117 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) create mode 100644 LICENSES/Apache-2.0.txt create mode 100644 LICENSES/GPL-2.0-only.txt diff --git a/LICENSES/Apache-2.0.txt b/LICENSES/Apache-2.0.txt new file mode 100644 index 00000000..137069b8 --- /dev/null +++ b/LICENSES/Apache-2.0.txt @@ -0,0 +1,73 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. + +"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: + + (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. + + You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + +To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/LICENSES/GPL-2.0-only.txt b/LICENSES/GPL-2.0-only.txt new file mode 100644 index 00000000..17cb2864 --- /dev/null +++ b/LICENSES/GPL-2.0-only.txt @@ -0,0 +1,117 @@ +GNU GENERAL PUBLIC LICENSE +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. + +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +END OF TERMS AND CONDITIONS + +How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. + +To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. + + one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. + +signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice From b9bfc96083ee14199fcbec1a6147eda508a3884a Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 19:58:42 +0000 Subject: [PATCH 07/13] Add first version of REUSE.toml file It gives copyright and license information for most or all files that have these suffixes in their file names: + .txt + .pdf + .png + .json Signed-off-by: Andy Fingerhut --- REUSE.toml | 446 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 446 insertions(+) create mode 100644 REUSE.toml diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 00000000..2cff4812 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,446 @@ +version = 1 + +[[annotations]] +path = "exercises/basic_tunnel/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic_tunnel/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic_tunnel/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic_tunnel/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/link_monitor/pod-topo/topology.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/link_monitor/pod-topo/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/link_monitor/pod-topo/s4-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/link_monitor/pod-topo/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/link_monitor/pod-topo/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/load_balance/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/load_balance/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/load_balance/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/load_balance/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/calc/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/calc/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/p4runtime/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/mri/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/mri/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/mri/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/mri/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/firewall/pod-topo/topology.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/firewall/pod-topo/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/firewall/pod-topo/s4-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/firewall/pod-topo/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/firewall/pod-topo/s1-runtime.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/qos/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/qos/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/qos/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/qos/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/ecn/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/ecn/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/ecn/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/ecn/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/triangle-topo/topology.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/triangle-topo/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/triangle-topo/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/triangle-topo/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/pod-topo/topology.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/pod-topo/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/pod-topo/s4-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/pod-topo/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/pod-topo/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/source_routing/topology.json" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/source_routing/s2-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/source_routing/s3-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/source_routing/s1-runtime.json" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/multicast/solution/s1-runtime.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/multicast/sig-topo/topology.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/multicast/sig-topo/s1-runtime.json" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "tmp2.txt" +SPDX-FileCopyrightText = " Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "p4-cheat-sheet.pdf" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/v1model_std_metadata.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/header_stack.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/architecture.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/expressions.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/tables.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/parsers.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/deparsing.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/control_flow.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/data_types.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/adv_parsing.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/counters.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/cheat_sheet_src/src/actions.txt" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/img/TopoExample.png" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/img/summary.png" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "utils/img/minipython.png" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-24.04/p4-logo.png" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-24.04/patches/mininet-patch-for-2024-sep-enable-venv.patch" +SPDX-FileCopyrightText = "2023 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-24.04/patches/p4runtime-shell-2023-changes.patch" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "LICENSES/GPL-2.0-only.txt" +SPDX-FileCopyrightText = "2025 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "LICENSES/Apache-2.0.txt" +SPDX-FileCopyrightText = "2025 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-20.04/p4-logo.png" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-20.04/patches/behavioral-model-use-correct-libssl-pkg.patch" +SPDX-FileCopyrightText = "2021 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm-ubuntu-20.04/patches/mininet-patch-for-2023-jun.patch" +SPDX-FileCopyrightText = "2023 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic_tunnel/topo.png" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic_tunnel/topo.pdf" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/link_monitor/link-monitor-topo.png" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/mri/setup.png" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/firewall/firewall-topo.png" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/qos/setup.png" +SPDX-FileCopyrightText = "2020 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/ecn/setup.png" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/basic/pod-topo/pod-topo.png" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/source_routing/setup.png" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "exercises/multicast/topo.png" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "P4_tutorial.pdf" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "tmp1.txt" +SPDX-FileCopyrightText = " Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" + +[[annotations]] +path = "vm/p4-logo.png" +SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-License-Identifier = "Apache-2.0" From 3817603890f824d72c2c5c9c36e0325dc9af588e Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 20:25:30 +0000 Subject: [PATCH 08/13] Add SPDX-FileCopyrightText lines to all Python source files ... ... that did not already have a copyright notice. Signed-off-by: Andy Fingerhut --- exercises/basic/receive.py | 4 ++++ exercises/basic/send.py | 4 ++++ exercises/basic_tunnel/myTunnel_header.py | 3 ++- exercises/basic_tunnel/receive.py | 4 ++++ exercises/basic_tunnel/send.py | 4 ++++ exercises/calc/calc.py | 3 +++ exercises/ecn/receive.py | 4 ++++ exercises/ecn/send.py | 3 +++ exercises/link_monitor/probe_hdrs.py | 3 +++ exercises/link_monitor/receive.py | 3 +++ exercises/link_monitor/send.py | 4 ++++ exercises/load_balance/receive.py | 4 ++++ exercises/load_balance/send.py | 4 ++++ exercises/mri/receive.py | 4 ++++ exercises/mri/send.py | 3 +++ exercises/p4runtime/mycontroller.py | 4 ++++ exercises/p4runtime/solution/mycontroller.py | 4 ++++ exercises/qos/receive.py | 3 +++ exercises/qos/send.py | 3 +++ exercises/source_routing/receive.py | 4 ++++ exercises/source_routing/send.py | 4 ++++ utils/mininet/appcontroller.py | 4 ++++ utils/mininet/apptopo.py | 4 ++++ utils/mininet/shortest_path.py | 4 ++++ vm-ubuntu-20.04/py3localpath.py | 3 +++ 25 files changed, 90 insertions(+), 1 deletion(-) diff --git a/exercises/basic/receive.py b/exercises/basic/receive.py index 91b95766..0d65776f 100755 --- a/exercises/basic/receive.py +++ b/exercises/basic/receive.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import os import sys diff --git a/exercises/basic/send.py b/exercises/basic/send.py index 926562c0..4286efe6 100755 --- a/exercises/basic/send.py +++ b/exercises/basic/send.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import random import socket import sys diff --git a/exercises/basic_tunnel/myTunnel_header.py b/exercises/basic_tunnel/myTunnel_header.py index 36c40a01..9f9c419d 100644 --- a/exercises/basic_tunnel/myTunnel_header.py +++ b/exercises/basic_tunnel/myTunnel_header.py @@ -1,7 +1,8 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy - from scapy.all import * TYPE_MYTUNNEL = 0x1212 diff --git a/exercises/basic_tunnel/receive.py b/exercises/basic_tunnel/receive.py index 6af3a405..542e1040 100755 --- a/exercises/basic_tunnel/receive.py +++ b/exercises/basic_tunnel/receive.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import os import sys diff --git a/exercises/basic_tunnel/send.py b/exercises/basic_tunnel/send.py index 09412bfd..833b5ee0 100755 --- a/exercises/basic_tunnel/send.py +++ b/exercises/basic_tunnel/send.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import argparse import random import socket diff --git a/exercises/calc/calc.py b/exercises/calc/calc.py index e1d29776..e718e8fd 100644 --- a/exercises/calc/calc.py +++ b/exercises/calc/calc.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/ecn/receive.py b/exercises/ecn/receive.py index 1c641dbf..1277773b 100755 --- a/exercises/ecn/receive.py +++ b/exercises/ecn/receive.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import sys from scapy.all import get_if_list, sniff diff --git a/exercises/ecn/send.py b/exercises/ecn/send.py index 29c612e3..ad1509e1 100755 --- a/exercises/ecn/send.py +++ b/exercises/ecn/send.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/link_monitor/probe_hdrs.py b/exercises/link_monitor/probe_hdrs.py index b112bbf2..1a7117ad 100755 --- a/exercises/link_monitor/probe_hdrs.py +++ b/exercises/link_monitor/probe_hdrs.py @@ -1,5 +1,8 @@ +# SPDX-FileCopyrightText: 2019 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + from scapy.all import * TYPE_PROBE = 0x812 diff --git a/exercises/link_monitor/receive.py b/exercises/link_monitor/receive.py index 4af4d772..0ccd4fe9 100755 --- a/exercises/link_monitor/receive.py +++ b/exercises/link_monitor/receive.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2019 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy via probe_hdrs diff --git a/exercises/link_monitor/send.py b/exercises/link_monitor/send.py index 5a526028..e576aad7 100755 --- a/exercises/link_monitor/send.py +++ b/exercises/link_monitor/send.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2019 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy via probe_hdrs + import sys import time diff --git a/exercises/load_balance/receive.py b/exercises/load_balance/receive.py index dd2dd8ac..8236c7ff 100755 --- a/exercises/load_balance/receive.py +++ b/exercises/load_balance/receive.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import os import sys diff --git a/exercises/load_balance/send.py b/exercises/load_balance/send.py index 926562c0..4286efe6 100755 --- a/exercises/load_balance/send.py +++ b/exercises/load_balance/send.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import random import socket import sys diff --git a/exercises/mri/receive.py b/exercises/mri/receive.py index 8739b3d8..4f01f1f2 100755 --- a/exercises/mri/receive.py +++ b/exercises/mri/receive.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import sys from scapy.all import ( diff --git a/exercises/mri/send.py b/exercises/mri/send.py index ddc3a77e..5f9fe4c7 100755 --- a/exercises/mri/send.py +++ b/exercises/mri/send.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/p4runtime/mycontroller.py b/exercises/p4runtime/mycontroller.py index befed054..f50cfd05 100755 --- a/exercises/p4runtime/mycontroller.py +++ b/exercises/p4runtime/mycontroller.py @@ -1,5 +1,9 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + import argparse import os import sys diff --git a/exercises/p4runtime/solution/mycontroller.py b/exercises/p4runtime/solution/mycontroller.py index 2fb15080..6b3210c4 100755 --- a/exercises/p4runtime/solution/mycontroller.py +++ b/exercises/p4runtime/solution/mycontroller.py @@ -1,5 +1,9 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + import argparse import os import sys diff --git a/exercises/qos/receive.py b/exercises/qos/receive.py index 7a374859..ae2233f9 100755 --- a/exercises/qos/receive.py +++ b/exercises/qos/receive.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2020 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/qos/send.py b/exercises/qos/send.py index e65248ed..5665652a 100755 --- a/exercises/qos/send.py +++ b/exercises/qos/send.py @@ -1,4 +1,7 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2020 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/source_routing/receive.py b/exercises/source_routing/receive.py index 524f30a1..1f9a5ba9 100755 --- a/exercises/source_routing/receive.py +++ b/exercises/source_routing/receive.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import sys from scapy.all import Ether, IPOption, Packet, bind_layers, get_if_list, sniff diff --git a/exercises/source_routing/send.py b/exercises/source_routing/send.py index 52881132..dab7e3c9 100755 --- a/exercises/source_routing/send.py +++ b/exercises/source_routing/send.py @@ -1,6 +1,10 @@ #!/usr/bin/env python3 + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy + import socket import sys diff --git a/utils/mininet/appcontroller.py b/utils/mininet/appcontroller.py index b0073d4e..9eb5f2d6 100644 --- a/utils/mininet/appcontroller.py +++ b/utils/mininet/appcontroller.py @@ -1,4 +1,8 @@ + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + import subprocess from shortest_path import ShortestPath diff --git a/utils/mininet/apptopo.py b/utils/mininet/apptopo.py index a63973e5..2d1b00a9 100644 --- a/utils/mininet/apptopo.py +++ b/utils/mininet/apptopo.py @@ -1,4 +1,8 @@ + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + from mininet.topo import Topo diff --git a/utils/mininet/shortest_path.py b/utils/mininet/shortest_path.py index 808a71a5..39126b1f 100644 --- a/utils/mininet/shortest_path.py +++ b/utils/mininet/shortest_path.py @@ -1,4 +1,8 @@ + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + class ShortestPath: def __init__(self, edges=[]): diff --git a/vm-ubuntu-20.04/py3localpath.py b/vm-ubuntu-20.04/py3localpath.py index 1cfb6145..f9c53336 100755 --- a/vm-ubuntu-20.04/py3localpath.py +++ b/vm-ubuntu-20.04/py3localpath.py @@ -1,4 +1,7 @@ #! /usr/bin/env python3 + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 import re From cd37ebffe5e0141ef021924c3f397556efb21b6d Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 20:31:39 +0000 Subject: [PATCH 09/13] Add SPDX-FileCopyrightText lines to all Bash script source files ... ... that did not already have a copyright notice. Signed-off-by: Andy Fingerhut --- exercises/multicast/disable_ipv6.sh | 4 ++++ vm-ubuntu-20.04/clean.sh | 3 +++ vm-ubuntu-20.04/root-common-bootstrap.sh | 3 +++ vm-ubuntu-20.04/root-dev-bootstrap.sh | 3 +++ vm-ubuntu-20.04/root-release-bootstrap.sh | 3 +++ vm-ubuntu-20.04/user-common-bootstrap.sh | 3 +++ vm-ubuntu-20.04/user-dev-bootstrap.sh | 3 +++ vm-ubuntu-24.04/clean.sh | 3 +++ vm/root-bootstrap.sh | 3 +++ vm/user-bootstrap.sh | 3 +++ 10 files changed, 31 insertions(+) diff --git a/exercises/multicast/disable_ipv6.sh b/exercises/multicast/disable_ipv6.sh index b223e3c0..c3cef062 100755 --- a/exercises/multicast/disable_ipv6.sh +++ b/exercises/multicast/disable_ipv6.sh @@ -1,4 +1,8 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2019 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1 sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1 diff --git a/vm-ubuntu-20.04/clean.sh b/vm-ubuntu-20.04/clean.sh index bdf9327c..e01bfdf3 100755 --- a/vm-ubuntu-20.04/clean.sh +++ b/vm-ubuntu-20.04/clean.sh @@ -1,4 +1,7 @@ #! /bin/bash + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # To reduce disk space used by the virtual machine, delete many build diff --git a/vm-ubuntu-20.04/root-common-bootstrap.sh b/vm-ubuntu-20.04/root-common-bootstrap.sh index cf2f3036..201ccdbb 100755 --- a/vm-ubuntu-20.04/root-common-bootstrap.sh +++ b/vm-ubuntu-20.04/root-common-bootstrap.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Print commands and exit on errors diff --git a/vm-ubuntu-20.04/root-dev-bootstrap.sh b/vm-ubuntu-20.04/root-dev-bootstrap.sh index cacb217c..f370a137 100755 --- a/vm-ubuntu-20.04/root-dev-bootstrap.sh +++ b/vm-ubuntu-20.04/root-dev-bootstrap.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Print commands and exit on errors diff --git a/vm-ubuntu-20.04/root-release-bootstrap.sh b/vm-ubuntu-20.04/root-release-bootstrap.sh index ea7514b9..8f8b4916 100755 --- a/vm-ubuntu-20.04/root-release-bootstrap.sh +++ b/vm-ubuntu-20.04/root-release-bootstrap.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Print commands and exit on errors diff --git a/vm-ubuntu-20.04/user-common-bootstrap.sh b/vm-ubuntu-20.04/user-common-bootstrap.sh index 099e3855..bf4e9603 100755 --- a/vm-ubuntu-20.04/user-common-bootstrap.sh +++ b/vm-ubuntu-20.04/user-common-bootstrap.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Print script commands and exit on errors. diff --git a/vm-ubuntu-20.04/user-dev-bootstrap.sh b/vm-ubuntu-20.04/user-dev-bootstrap.sh index e6b25936..3e6ca472 100755 --- a/vm-ubuntu-20.04/user-dev-bootstrap.sh +++ b/vm-ubuntu-20.04/user-dev-bootstrap.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Print script commands and exit on errors. diff --git a/vm-ubuntu-24.04/clean.sh b/vm-ubuntu-24.04/clean.sh index 56a27c98..dec27258 100755 --- a/vm-ubuntu-24.04/clean.sh +++ b/vm-ubuntu-24.04/clean.sh @@ -1,4 +1,7 @@ #! /bin/bash + +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # To reduce disk space used by the virtual machine, delete many build diff --git a/vm/root-bootstrap.sh b/vm/root-bootstrap.sh index 767a8f66..7ad9880b 100755 --- a/vm/root-bootstrap.sh +++ b/vm/root-bootstrap.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Print commands and exit on errors diff --git a/vm/user-bootstrap.sh b/vm/user-bootstrap.sh index 96bbef9b..8d20a743 100755 --- a/vm/user-bootstrap.sh +++ b/vm/user-bootstrap.sh @@ -1,4 +1,7 @@ #!/bin/bash + +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Print script commands and exit on errors. From d0d1c1500898a43f79ec5de99f8719e657044374 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 20:35:04 +0000 Subject: [PATCH 10/13] Add SPDX-FileCopyrightText lines to all Makefiles ... ... that did not already have a copyright notice. Signed-off-by: Andy Fingerhut --- exercises/basic/Makefile | 3 +++ exercises/basic_tunnel/Makefile | 3 +++ exercises/calc/Makefile | 3 +++ exercises/ecn/Makefile | 3 +++ exercises/firewall/Makefile | 3 +++ exercises/link_monitor/Makefile | 3 +++ exercises/load_balance/Makefile | 3 +++ exercises/mri/Makefile | 3 +++ exercises/multicast/Makefile | 3 +++ exercises/p4runtime/Makefile | 3 +++ exercises/qos/Makefile | 3 +++ exercises/source_routing/Makefile | 3 +++ utils/Makefile | 3 +++ 13 files changed, 39 insertions(+) diff --git a/exercises/basic/Makefile b/exercises/basic/Makefile index da31be2f..15746e6a 100644 --- a/exercises/basic/Makefile +++ b/exercises/basic/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc TOPO = pod-topo/topology.json diff --git a/exercises/basic_tunnel/Makefile b/exercises/basic_tunnel/Makefile index dc2ba66b..3cb86d18 100644 --- a/exercises/basic_tunnel/Makefile +++ b/exercises/basic_tunnel/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc include ../../utils/Makefile diff --git a/exercises/calc/Makefile b/exercises/calc/Makefile index 36bc75e8..6996ee96 100644 --- a/exercises/calc/Makefile +++ b/exercises/calc/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc #NO_P4 = true #P4C_ARGS = --p4runtime-file $(basename $@).p4info --p4runtime-format text diff --git a/exercises/ecn/Makefile b/exercises/ecn/Makefile index dc2ba66b..3cb86d18 100644 --- a/exercises/ecn/Makefile +++ b/exercises/ecn/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc include ../../utils/Makefile diff --git a/exercises/firewall/Makefile b/exercises/firewall/Makefile index 6f711539..ed4fbf9f 100644 --- a/exercises/firewall/Makefile +++ b/exercises/firewall/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2019 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc TOPO = pod-topo/topology.json DEFAULT_PROG = basic.p4 diff --git a/exercises/link_monitor/Makefile b/exercises/link_monitor/Makefile index da31be2f..d7c85cd8 100644 --- a/exercises/link_monitor/Makefile +++ b/exercises/link_monitor/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2019 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc TOPO = pod-topo/topology.json diff --git a/exercises/load_balance/Makefile b/exercises/load_balance/Makefile index dc2ba66b..3cb86d18 100644 --- a/exercises/load_balance/Makefile +++ b/exercises/load_balance/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc include ../../utils/Makefile diff --git a/exercises/mri/Makefile b/exercises/mri/Makefile index dc2ba66b..3cb86d18 100644 --- a/exercises/mri/Makefile +++ b/exercises/mri/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc include ../../utils/Makefile diff --git a/exercises/multicast/Makefile b/exercises/multicast/Makefile index 8d7d0b0f..11171c52 100644 --- a/exercises/multicast/Makefile +++ b/exercises/multicast/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc TOPO = sig-topo/topology.json diff --git a/exercises/p4runtime/Makefile b/exercises/p4runtime/Makefile index dc2ba66b..3cb86d18 100644 --- a/exercises/p4runtime/Makefile +++ b/exercises/p4runtime/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc include ../../utils/Makefile diff --git a/exercises/qos/Makefile b/exercises/qos/Makefile index dc2ba66b..3cb86d18 100644 --- a/exercises/qos/Makefile +++ b/exercises/qos/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc include ../../utils/Makefile diff --git a/exercises/source_routing/Makefile b/exercises/source_routing/Makefile index dc2ba66b..3cb86d18 100644 --- a/exercises/source_routing/Makefile +++ b/exercises/source_routing/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BMV2_SWITCH_EXE = simple_switch_grpc include ../../utils/Makefile diff --git a/utils/Makefile b/utils/Makefile index 44fe8ea9..d3f3ce72 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,4 +1,7 @@ +# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 + BUILD_DIR = build PCAP_DIR = pcaps LOG_DIR = logs From 658c6743ac7efa05c05e1acda1af7b4efc157f26 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 20:44:26 +0000 Subject: [PATCH 11/13] Add SPDX-FileCopyrightText lines to all P4 source files ... ... that did not already have a copyright notice. Signed-off-by: Andy Fingerhut --- exercises/basic/basic.p4 | 3 +++ exercises/basic/solution/basic.p4 | 3 +++ exercises/basic_tunnel/basic_tunnel.p4 | 3 +++ exercises/basic_tunnel/solution/basic_tunnel.p4 | 3 +++ exercises/calc/calc.p4 | 3 +++ exercises/calc/solution/calc.p4 | 3 +++ exercises/ecn/ecn.p4 | 3 +++ exercises/ecn/solution/ecn.p4 | 3 +++ exercises/firewall/basic.p4 | 3 +++ exercises/firewall/firewall.p4 | 3 +++ exercises/firewall/solution/firewall.p4 | 3 +++ exercises/link_monitor/link_monitor.p4 | 3 +++ exercises/link_monitor/solution/link_monitor.p4 | 3 +++ exercises/load_balance/load_balance.p4 | 3 +++ exercises/load_balance/solution/load_balance.p4 | 3 +++ exercises/mri/mri.p4 | 3 +++ exercises/mri/solution/mri.p4 | 3 +++ exercises/multicast/multicast.p4 | 3 +++ exercises/multicast/solution/multicast.p4 | 3 +++ exercises/p4runtime/advanced_tunnel.p4 | 3 +++ exercises/qos/qos.p4 | 3 +++ exercises/qos/solution/qos.p4 | 3 +++ exercises/source_routing/solution/source_routing.p4 | 3 +++ exercises/source_routing/source_routing.p4 | 3 +++ 24 files changed, 72 insertions(+) diff --git a/exercises/basic/basic.p4 b/exercises/basic/basic.p4 index 53cf3451..6021967e 100644 --- a/exercises/basic/basic.p4 +++ b/exercises/basic/basic.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/basic/solution/basic.p4 b/exercises/basic/solution/basic.p4 index 9640dcfd..0ba40f82 100644 --- a/exercises/basic/solution/basic.p4 +++ b/exercises/basic/solution/basic.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/basic_tunnel/basic_tunnel.p4 b/exercises/basic_tunnel/basic_tunnel.p4 index b29912f6..f652a5ed 100644 --- a/exercises/basic_tunnel/basic_tunnel.p4 +++ b/exercises/basic_tunnel/basic_tunnel.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/basic_tunnel/solution/basic_tunnel.p4 b/exercises/basic_tunnel/solution/basic_tunnel.p4 index 947591ea..410212ed 100644 --- a/exercises/basic_tunnel/solution/basic_tunnel.p4 +++ b/exercises/basic_tunnel/solution/basic_tunnel.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/calc/calc.p4 b/exercises/calc/calc.p4 index a2b909f0..bb150f49 100644 --- a/exercises/calc/calc.p4 +++ b/exercises/calc/calc.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ /* diff --git a/exercises/calc/solution/calc.p4 b/exercises/calc/solution/calc.p4 index c5a419d1..ebf53a35 100644 --- a/exercises/calc/solution/calc.p4 +++ b/exercises/calc/solution/calc.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ /* diff --git a/exercises/ecn/ecn.p4 b/exercises/ecn/ecn.p4 index 8d26bf1a..9a3b3344 100644 --- a/exercises/ecn/ecn.p4 +++ b/exercises/ecn/ecn.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/ecn/solution/ecn.p4 b/exercises/ecn/solution/ecn.p4 index 40e4fb0b..8f8a30ea 100644 --- a/exercises/ecn/solution/ecn.p4 +++ b/exercises/ecn/solution/ecn.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/firewall/basic.p4 b/exercises/firewall/basic.p4 index fba56092..b6fe1cdb 100644 --- a/exercises/firewall/basic.p4 +++ b/exercises/firewall/basic.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/firewall/firewall.p4 b/exercises/firewall/firewall.p4 index f767830e..ee0d9a97 100644 --- a/exercises/firewall/firewall.p4 +++ b/exercises/firewall/firewall.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/firewall/solution/firewall.p4 b/exercises/firewall/solution/firewall.p4 index 5c5e2a7d..cc166d0e 100644 --- a/exercises/firewall/solution/firewall.p4 +++ b/exercises/firewall/solution/firewall.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/link_monitor/link_monitor.p4 b/exercises/link_monitor/link_monitor.p4 index d3c546e5..27b523c6 100644 --- a/exercises/link_monitor/link_monitor.p4 +++ b/exercises/link_monitor/link_monitor.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/link_monitor/solution/link_monitor.p4 b/exercises/link_monitor/solution/link_monitor.p4 index c2f5f2eb..b75237b0 100644 --- a/exercises/link_monitor/solution/link_monitor.p4 +++ b/exercises/link_monitor/solution/link_monitor.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/load_balance/load_balance.p4 b/exercises/load_balance/load_balance.p4 index 48ab4bd2..1f74a816 100644 --- a/exercises/load_balance/load_balance.p4 +++ b/exercises/load_balance/load_balance.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/load_balance/solution/load_balance.p4 b/exercises/load_balance/solution/load_balance.p4 index dd13074c..7dcf8518 100644 --- a/exercises/load_balance/solution/load_balance.p4 +++ b/exercises/load_balance/solution/load_balance.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/mri/mri.p4 b/exercises/mri/mri.p4 index 42061834..da335c79 100644 --- a/exercises/mri/mri.p4 +++ b/exercises/mri/mri.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/mri/solution/mri.p4 b/exercises/mri/solution/mri.p4 index c32b7428..fec9ecf4 100644 --- a/exercises/mri/solution/mri.p4 +++ b/exercises/mri/solution/mri.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/multicast/multicast.p4 b/exercises/multicast/multicast.p4 index 0d111f9a..7b2c9122 100644 --- a/exercises/multicast/multicast.p4 +++ b/exercises/multicast/multicast.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/multicast/solution/multicast.p4 b/exercises/multicast/solution/multicast.p4 index 817b50a6..55e25f30 100644 --- a/exercises/multicast/solution/multicast.p4 +++ b/exercises/multicast/solution/multicast.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/p4runtime/advanced_tunnel.p4 b/exercises/p4runtime/advanced_tunnel.p4 index ca7930fb..bc86e80c 100755 --- a/exercises/p4runtime/advanced_tunnel.p4 +++ b/exercises/p4runtime/advanced_tunnel.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/qos/qos.p4 b/exercises/qos/qos.p4 index 3349c2d9..31ef032d 100644 --- a/exercises/qos/qos.p4 +++ b/exercises/qos/qos.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/qos/solution/qos.p4 b/exercises/qos/solution/qos.p4 index 926dfce1..40f4284d 100644 --- a/exercises/qos/solution/qos.p4 +++ b/exercises/qos/solution/qos.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/source_routing/solution/source_routing.p4 b/exercises/source_routing/solution/source_routing.p4 index cabb7ad0..74fb2335 100644 --- a/exercises/source_routing/solution/source_routing.p4 +++ b/exercises/source_routing/solution/source_routing.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include diff --git a/exercises/source_routing/source_routing.p4 b/exercises/source_routing/source_routing.p4 index ac73e987..322ef4e4 100644 --- a/exercises/source_routing/source_routing.p4 +++ b/exercises/source_routing/source_routing.p4 @@ -1,4 +1,7 @@ +// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// // SPDX-License-Identifier: Apache-2.0 + /* -*- P4_16 -*- */ #include #include From 2119db83ae3a48ab9885657f940cc92b5504504d Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sat, 22 Mar 2025 20:59:03 +0000 Subject: [PATCH 12/13] Add SPDX-FileCopyrightText lines to a few source files ... ... that did not already have a copyright notice. Signed-off-by: Andy Fingerhut --- .gitignore | 2 ++ utils/cheat_sheet_src/main.tex | 2 ++ vm-ubuntu-20.04/Vagrantfile | 2 ++ vm-ubuntu-20.04/p4.vim | 2 ++ vm-ubuntu-24.04/Vagrantfile | 2 ++ vm-ubuntu-24.04/p4.vim | 2 ++ vm/Vagrantfile | 2 ++ vm/p4.vim | 2 ++ 8 files changed, 16 insertions(+) diff --git a/.gitignore b/.gitignore index 10c8bb88..076307f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2016 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # Python byte code diff --git a/utils/cheat_sheet_src/main.tex b/utils/cheat_sheet_src/main.tex index 9ada819b..202ea231 100644 --- a/utils/cheat_sheet_src/main.tex +++ b/utils/cheat_sheet_src/main.tex @@ -1,4 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% SPDX-FileCopyrightText: 2018 Contributors to the P4 Project +# % SPDX-License-Identifier: Apache-2.0 % % P4 Cheat Sheet diff --git a/vm-ubuntu-20.04/Vagrantfile b/vm-ubuntu-20.04/Vagrantfile index 3a11eae7..f6169860 100644 --- a/vm-ubuntu-20.04/Vagrantfile +++ b/vm-ubuntu-20.04/Vagrantfile @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # -*- mode: ruby -*- # vi: set ft=ruby : diff --git a/vm-ubuntu-20.04/p4.vim b/vm-ubuntu-20.04/p4.vim index 2f626a67..1d081fb6 100644 --- a/vm-ubuntu-20.04/p4.vim +++ b/vm-ubuntu-20.04/p4.vim @@ -1,3 +1,5 @@ +" SPDX-FileCopyrightText: 2018 Contributors to the P4 Project +" " SPDX-License-Identifier: Apache-2.0 " Vim syntax file " Language: P4_16 diff --git a/vm-ubuntu-24.04/Vagrantfile b/vm-ubuntu-24.04/Vagrantfile index 163ae5fe..4a5fc7e1 100644 --- a/vm-ubuntu-24.04/Vagrantfile +++ b/vm-ubuntu-24.04/Vagrantfile @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2024 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # -*- mode: ruby -*- # vi: set ft=ruby : diff --git a/vm-ubuntu-24.04/p4.vim b/vm-ubuntu-24.04/p4.vim index 2f626a67..1d081fb6 100644 --- a/vm-ubuntu-24.04/p4.vim +++ b/vm-ubuntu-24.04/p4.vim @@ -1,3 +1,5 @@ +" SPDX-FileCopyrightText: 2018 Contributors to the P4 Project +" " SPDX-License-Identifier: Apache-2.0 " Vim syntax file " Language: P4_16 diff --git a/vm/Vagrantfile b/vm/Vagrantfile index def873cd..fd8d9dbc 100644 --- a/vm/Vagrantfile +++ b/vm/Vagrantfile @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project +# # SPDX-License-Identifier: Apache-2.0 # -*- mode: ruby -*- # vi: set ft=ruby : diff --git a/vm/p4.vim b/vm/p4.vim index 2f626a67..1d081fb6 100644 --- a/vm/p4.vim +++ b/vm/p4.vim @@ -1,3 +1,5 @@ +" SPDX-FileCopyrightText: 2018 Contributors to the P4 Project +" " SPDX-License-Identifier: Apache-2.0 " Vim syntax file " Language: P4_16 From bc20f4c161779f24b72e2553846b78fdb30aef23 Mon Sep 17 00:00:00 2001 From: Andy Fingerhut Date: Sun, 23 Mar 2025 03:56:33 +0000 Subject: [PATCH 13/13] Correct many copyright years that were incorrect because of an earlier step I did automated to find the earliest commit year of files that gave the wrong answer. Signed-off-by: Andy Fingerhut --- REUSE.toml | 60 +++++++++---------- exercises/basic/Makefile | 2 +- exercises/basic/README.md | 2 +- exercises/basic/basic.p4 | 2 +- exercises/basic/receive.py | 2 +- exercises/basic/send.py | 2 +- exercises/basic/solution/basic.p4 | 2 +- exercises/basic_tunnel/Makefile | 2 +- exercises/basic_tunnel/README.md | 2 +- exercises/basic_tunnel/basic_tunnel.p4 | 2 +- exercises/basic_tunnel/myTunnel_header.py | 2 +- exercises/basic_tunnel/receive.py | 2 +- exercises/basic_tunnel/send.py | 2 +- .../basic_tunnel/solution/basic_tunnel.p4 | 2 +- exercises/calc/Makefile | 2 +- exercises/calc/README.md | 2 +- exercises/calc/calc.p4 | 2 +- exercises/calc/calc.py | 2 +- exercises/calc/solution/calc.p4 | 2 +- exercises/ecn/Makefile | 2 +- exercises/ecn/README.md | 2 +- exercises/ecn/ecn.p4 | 2 +- exercises/ecn/receive.py | 2 +- exercises/ecn/send.py | 2 +- exercises/ecn/solution/ecn.p4 | 2 +- exercises/firewall/basic.p4 | 2 +- exercises/firewall/firewall.p4 | 2 +- exercises/firewall/solution/firewall.p4 | 2 +- exercises/link_monitor/link_monitor.p4 | 2 +- .../link_monitor/solution/link_monitor.p4 | 2 +- exercises/load_balance/Makefile | 2 +- exercises/load_balance/load_balance.p4 | 2 +- exercises/load_balance/receive.py | 2 +- exercises/load_balance/send.py | 2 +- .../load_balance/solution/load_balance.p4 | 2 +- exercises/mri/Makefile | 2 +- exercises/mri/README.md | 2 +- exercises/mri/mri.p4 | 2 +- exercises/mri/receive.py | 2 +- exercises/mri/send.py | 2 +- exercises/mri/solution/mri.p4 | 2 +- exercises/multicast/Makefile | 2 +- exercises/multicast/multicast.p4 | 2 +- exercises/multicast/solution/multicast.p4 | 2 +- exercises/p4runtime/Makefile | 2 +- exercises/p4runtime/README.md | 2 +- exercises/p4runtime/advanced_tunnel.p4 | 2 +- exercises/p4runtime/mycontroller.py | 2 +- exercises/p4runtime/solution/mycontroller.py | 2 +- exercises/qos/Makefile | 2 +- exercises/qos/README.md | 2 +- exercises/qos/qos.p4 | 2 +- exercises/qos/solution/qos.p4 | 2 +- exercises/source_routing/Makefile | 2 +- exercises/source_routing/README.md | 2 +- exercises/source_routing/receive.py | 2 +- exercises/source_routing/send.py | 2 +- .../source_routing/solution/source_routing.p4 | 2 +- exercises/source_routing/source_routing.p4 | 2 +- utils/Makefile | 2 +- utils/mininet/appcontroller.py | 2 +- utils/mininet/apptopo.py | 2 +- utils/mininet/shortest_path.py | 2 +- vm-ubuntu-20.04/p4.vim | 2 +- vm-ubuntu-24.04/README.md | 2 +- vm-ubuntu-24.04/clean.sh | 2 +- vm-ubuntu-24.04/create-vm-image-for-others.md | 2 +- vm-ubuntu-24.04/p4.vim | 2 +- vm/root-bootstrap.sh | 2 +- vm/user-bootstrap.sh | 2 +- 70 files changed, 99 insertions(+), 99 deletions(-) diff --git a/REUSE.toml b/REUSE.toml index 2cff4812..4b9a6f42 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -2,7 +2,7 @@ version = 1 [[annotations]] path = "exercises/basic_tunnel/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -27,27 +27,27 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/link_monitor/pod-topo/s2-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/link_monitor/pod-topo/s4-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/link_monitor/pod-topo/s3-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/link_monitor/pod-topo/s1-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/load_balance/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -67,7 +67,7 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/calc/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -77,12 +77,12 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/p4runtime/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/mri/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -107,17 +107,17 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/firewall/pod-topo/s2-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/firewall/pod-topo/s4-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/firewall/pod-topo/s3-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -127,27 +127,27 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/qos/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2020 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/qos/s2-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2020 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/qos/s3-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2020 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/qos/s1-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2020 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/ecn/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -172,17 +172,17 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic/triangle-topo/s2-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic/triangle-topo/s3-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic/triangle-topo/s1-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -192,27 +192,27 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic/pod-topo/s2-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic/pod-topo/s4-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic/pod-topo/s3-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic/pod-topo/s1-runtime.json" -SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2019 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/source_routing/topology.json" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -337,7 +337,7 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "vm-ubuntu-24.04/patches/mininet-patch-for-2024-sep-enable-venv.patch" -SPDX-FileCopyrightText = "2023 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2024 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -382,12 +382,12 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic_tunnel/topo.png" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/basic_tunnel/topo.pdf" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -397,7 +397,7 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/mri/setup.png" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] @@ -412,7 +412,7 @@ SPDX-License-Identifier = "Apache-2.0" [[annotations]] path = "exercises/ecn/setup.png" -SPDX-FileCopyrightText = "2017 Contributors to the P4 Project" +SPDX-FileCopyrightText = "2018 Contributors to the P4 Project" SPDX-License-Identifier = "Apache-2.0" [[annotations]] diff --git a/exercises/basic/Makefile b/exercises/basic/Makefile index 15746e6a..18619cd8 100644 --- a/exercises/basic/Makefile +++ b/exercises/basic/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/basic/README.md b/exercises/basic/README.md index 81445b68..b70ffdf2 100644 --- a/exercises/basic/README.md +++ b/exercises/basic/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/basic/basic.p4 b/exercises/basic/basic.p4 index 6021967e..a5e31156 100644 --- a/exercises/basic/basic.p4 +++ b/exercises/basic/basic.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/basic/receive.py b/exercises/basic/receive.py index 0d65776f..128bbfa9 100755 --- a/exercises/basic/receive.py +++ b/exercises/basic/receive.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/basic/send.py b/exercises/basic/send.py index 4286efe6..d90c0543 100755 --- a/exercises/basic/send.py +++ b/exercises/basic/send.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/basic/solution/basic.p4 b/exercises/basic/solution/basic.p4 index 0ba40f82..efd1def0 100644 --- a/exercises/basic/solution/basic.p4 +++ b/exercises/basic/solution/basic.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/basic_tunnel/Makefile b/exercises/basic_tunnel/Makefile index 3cb86d18..fef07d45 100644 --- a/exercises/basic_tunnel/Makefile +++ b/exercises/basic_tunnel/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/basic_tunnel/README.md b/exercises/basic_tunnel/README.md index eb8b712b..73b76daa 100644 --- a/exercises/basic_tunnel/README.md +++ b/exercises/basic_tunnel/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/basic_tunnel/basic_tunnel.p4 b/exercises/basic_tunnel/basic_tunnel.p4 index f652a5ed..050814ec 100644 --- a/exercises/basic_tunnel/basic_tunnel.p4 +++ b/exercises/basic_tunnel/basic_tunnel.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/basic_tunnel/myTunnel_header.py b/exercises/basic_tunnel/myTunnel_header.py index 9f9c419d..ad0bd008 100644 --- a/exercises/basic_tunnel/myTunnel_header.py +++ b/exercises/basic_tunnel/myTunnel_header.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/basic_tunnel/receive.py b/exercises/basic_tunnel/receive.py index 542e1040..018e31a0 100755 --- a/exercises/basic_tunnel/receive.py +++ b/exercises/basic_tunnel/receive.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/basic_tunnel/send.py b/exercises/basic_tunnel/send.py index 833b5ee0..e7cffbb8 100755 --- a/exercises/basic_tunnel/send.py +++ b/exercises/basic_tunnel/send.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/basic_tunnel/solution/basic_tunnel.p4 b/exercises/basic_tunnel/solution/basic_tunnel.p4 index 410212ed..2e3c91db 100644 --- a/exercises/basic_tunnel/solution/basic_tunnel.p4 +++ b/exercises/basic_tunnel/solution/basic_tunnel.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/calc/Makefile b/exercises/calc/Makefile index 6996ee96..ab45ec97 100644 --- a/exercises/calc/Makefile +++ b/exercises/calc/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/calc/README.md b/exercises/calc/README.md index 0150eeb7..39f0dd0c 100644 --- a/exercises/calc/README.md +++ b/exercises/calc/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/calc/calc.p4 b/exercises/calc/calc.p4 index bb150f49..8fc56b57 100644 --- a/exercises/calc/calc.p4 +++ b/exercises/calc/calc.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/calc/calc.py b/exercises/calc/calc.py index e718e8fd..2b1a5f88 100644 --- a/exercises/calc/calc.py +++ b/exercises/calc/calc.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/calc/solution/calc.p4 b/exercises/calc/solution/calc.p4 index ebf53a35..93d8ddf5 100644 --- a/exercises/calc/solution/calc.p4 +++ b/exercises/calc/solution/calc.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/ecn/Makefile b/exercises/ecn/Makefile index 3cb86d18..fef07d45 100644 --- a/exercises/ecn/Makefile +++ b/exercises/ecn/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/ecn/README.md b/exercises/ecn/README.md index 6f57f897..8b744999 100644 --- a/exercises/ecn/README.md +++ b/exercises/ecn/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/ecn/ecn.p4 b/exercises/ecn/ecn.p4 index 9a3b3344..ad3c413d 100644 --- a/exercises/ecn/ecn.p4 +++ b/exercises/ecn/ecn.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/ecn/receive.py b/exercises/ecn/receive.py index 1277773b..9b35ab78 100755 --- a/exercises/ecn/receive.py +++ b/exercises/ecn/receive.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/ecn/send.py b/exercises/ecn/send.py index ad1509e1..df6d7738 100755 --- a/exercises/ecn/send.py +++ b/exercises/ecn/send.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/ecn/solution/ecn.p4 b/exercises/ecn/solution/ecn.p4 index 8f8a30ea..0cd6d553 100644 --- a/exercises/ecn/solution/ecn.p4 +++ b/exercises/ecn/solution/ecn.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/firewall/basic.p4 b/exercises/firewall/basic.p4 index b6fe1cdb..95d0cdf9 100644 --- a/exercises/firewall/basic.p4 +++ b/exercises/firewall/basic.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2019 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/firewall/firewall.p4 b/exercises/firewall/firewall.p4 index ee0d9a97..5711d29f 100644 --- a/exercises/firewall/firewall.p4 +++ b/exercises/firewall/firewall.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2019 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/firewall/solution/firewall.p4 b/exercises/firewall/solution/firewall.p4 index cc166d0e..1a80863d 100644 --- a/exercises/firewall/solution/firewall.p4 +++ b/exercises/firewall/solution/firewall.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2019 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/link_monitor/link_monitor.p4 b/exercises/link_monitor/link_monitor.p4 index 27b523c6..34335a4f 100644 --- a/exercises/link_monitor/link_monitor.p4 +++ b/exercises/link_monitor/link_monitor.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2019 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/link_monitor/solution/link_monitor.p4 b/exercises/link_monitor/solution/link_monitor.p4 index b75237b0..da736583 100644 --- a/exercises/link_monitor/solution/link_monitor.p4 +++ b/exercises/link_monitor/solution/link_monitor.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2019 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/load_balance/Makefile b/exercises/load_balance/Makefile index 3cb86d18..fef07d45 100644 --- a/exercises/load_balance/Makefile +++ b/exercises/load_balance/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/load_balance/load_balance.p4 b/exercises/load_balance/load_balance.p4 index 1f74a816..0374c212 100644 --- a/exercises/load_balance/load_balance.p4 +++ b/exercises/load_balance/load_balance.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/load_balance/receive.py b/exercises/load_balance/receive.py index 8236c7ff..b44ea086 100755 --- a/exercises/load_balance/receive.py +++ b/exercises/load_balance/receive.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/load_balance/send.py b/exercises/load_balance/send.py index 4286efe6..d90c0543 100755 --- a/exercises/load_balance/send.py +++ b/exercises/load_balance/send.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/load_balance/solution/load_balance.p4 b/exercises/load_balance/solution/load_balance.p4 index 7dcf8518..df0597bf 100644 --- a/exercises/load_balance/solution/load_balance.p4 +++ b/exercises/load_balance/solution/load_balance.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/mri/Makefile b/exercises/mri/Makefile index 3cb86d18..fef07d45 100644 --- a/exercises/mri/Makefile +++ b/exercises/mri/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/mri/README.md b/exercises/mri/README.md index d21fee9f..fb3dca35 100644 --- a/exercises/mri/README.md +++ b/exercises/mri/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/mri/mri.p4 b/exercises/mri/mri.p4 index da335c79..878d0073 100644 --- a/exercises/mri/mri.p4 +++ b/exercises/mri/mri.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/mri/receive.py b/exercises/mri/receive.py index 4f01f1f2..1760df9a 100755 --- a/exercises/mri/receive.py +++ b/exercises/mri/receive.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/mri/send.py b/exercises/mri/send.py index 5f9fe4c7..85c3b58b 100755 --- a/exercises/mri/send.py +++ b/exercises/mri/send.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/mri/solution/mri.p4 b/exercises/mri/solution/mri.p4 index fec9ecf4..09648c6a 100644 --- a/exercises/mri/solution/mri.p4 +++ b/exercises/mri/solution/mri.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/multicast/Makefile b/exercises/multicast/Makefile index 11171c52..5892c12e 100644 --- a/exercises/multicast/Makefile +++ b/exercises/multicast/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2019 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/multicast/multicast.p4 b/exercises/multicast/multicast.p4 index 7b2c9122..70b35dd2 100644 --- a/exercises/multicast/multicast.p4 +++ b/exercises/multicast/multicast.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2019 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/multicast/solution/multicast.p4 b/exercises/multicast/solution/multicast.p4 index 55e25f30..b02152ed 100644 --- a/exercises/multicast/solution/multicast.p4 +++ b/exercises/multicast/solution/multicast.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2019 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/p4runtime/Makefile b/exercises/p4runtime/Makefile index 3cb86d18..fef07d45 100644 --- a/exercises/p4runtime/Makefile +++ b/exercises/p4runtime/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/p4runtime/README.md b/exercises/p4runtime/README.md index 1df40535..ff921c0b 100644 --- a/exercises/p4runtime/README.md +++ b/exercises/p4runtime/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/p4runtime/advanced_tunnel.p4 b/exercises/p4runtime/advanced_tunnel.p4 index bc86e80c..65cec20b 100755 --- a/exercises/p4runtime/advanced_tunnel.p4 +++ b/exercises/p4runtime/advanced_tunnel.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/p4runtime/mycontroller.py b/exercises/p4runtime/mycontroller.py index f50cfd05..16cc2eee 100755 --- a/exercises/p4runtime/mycontroller.py +++ b/exercises/p4runtime/mycontroller.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/p4runtime/solution/mycontroller.py b/exercises/p4runtime/solution/mycontroller.py index 6b3210c4..bc4e0f7a 100755 --- a/exercises/p4runtime/solution/mycontroller.py +++ b/exercises/p4runtime/solution/mycontroller.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/qos/Makefile b/exercises/qos/Makefile index 3cb86d18..8dece914 100644 --- a/exercises/qos/Makefile +++ b/exercises/qos/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2020 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/qos/README.md b/exercises/qos/README.md index 990201ea..9402b522 100644 --- a/exercises/qos/README.md +++ b/exercises/qos/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/qos/qos.p4 b/exercises/qos/qos.p4 index 31ef032d..bd8ed8e8 100644 --- a/exercises/qos/qos.p4 +++ b/exercises/qos/qos.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2020 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/qos/solution/qos.p4 b/exercises/qos/solution/qos.p4 index 40f4284d..d0a2f300 100644 --- a/exercises/qos/solution/qos.p4 +++ b/exercises/qos/solution/qos.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2020 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/source_routing/Makefile b/exercises/source_routing/Makefile index 3cb86d18..fef07d45 100644 --- a/exercises/source_routing/Makefile +++ b/exercises/source_routing/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/source_routing/README.md b/exercises/source_routing/README.md index 460f95d0..e88a4193 100644 --- a/exercises/source_routing/README.md +++ b/exercises/source_routing/README.md @@ -1,5 +1,5 @@ diff --git a/exercises/source_routing/receive.py b/exercises/source_routing/receive.py index 1f9a5ba9..014bbf70 100755 --- a/exercises/source_routing/receive.py +++ b/exercises/source_routing/receive.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/source_routing/send.py b/exercises/source_routing/send.py index dab7e3c9..bb594818 100755 --- a/exercises/source_routing/send.py +++ b/exercises/source_routing/send.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: GPL-2.0-only # Reason-GPL: import-scapy diff --git a/exercises/source_routing/solution/source_routing.p4 b/exercises/source_routing/solution/source_routing.p4 index 74fb2335..8e1d0659 100644 --- a/exercises/source_routing/solution/source_routing.p4 +++ b/exercises/source_routing/solution/source_routing.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/exercises/source_routing/source_routing.p4 b/exercises/source_routing/source_routing.p4 index 322ef4e4..f1ac9eca 100644 --- a/exercises/source_routing/source_routing.p4 +++ b/exercises/source_routing/source_routing.p4 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +// SPDX-FileCopyrightText: 2018 Contributors to the P4 Project // // SPDX-License-Identifier: Apache-2.0 diff --git a/utils/Makefile b/utils/Makefile index d3f3ce72..432358c9 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/utils/mininet/appcontroller.py b/utils/mininet/appcontroller.py index 9eb5f2d6..4e553482 100644 --- a/utils/mininet/appcontroller.py +++ b/utils/mininet/appcontroller.py @@ -1,5 +1,5 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/utils/mininet/apptopo.py b/utils/mininet/apptopo.py index 2d1b00a9..501448ba 100644 --- a/utils/mininet/apptopo.py +++ b/utils/mininet/apptopo.py @@ -1,5 +1,5 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/utils/mininet/shortest_path.py b/utils/mininet/shortest_path.py index 39126b1f..d89f6b98 100644 --- a/utils/mininet/shortest_path.py +++ b/utils/mininet/shortest_path.py @@ -1,5 +1,5 @@ -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/vm-ubuntu-20.04/p4.vim b/vm-ubuntu-20.04/p4.vim index 1d081fb6..122e71bc 100644 --- a/vm-ubuntu-20.04/p4.vim +++ b/vm-ubuntu-20.04/p4.vim @@ -1,4 +1,4 @@ -" SPDX-FileCopyrightText: 2018 Contributors to the P4 Project +" SPDX-FileCopyrightText: 2017 Contributors to the P4 Project " " SPDX-License-Identifier: Apache-2.0 " Vim syntax file diff --git a/vm-ubuntu-24.04/README.md b/vm-ubuntu-24.04/README.md index 1028dbab..0209eb6c 100644 --- a/vm-ubuntu-24.04/README.md +++ b/vm-ubuntu-24.04/README.md @@ -1,5 +1,5 @@ diff --git a/vm-ubuntu-24.04/clean.sh b/vm-ubuntu-24.04/clean.sh index dec27258..2493a29d 100755 --- a/vm-ubuntu-24.04/clean.sh +++ b/vm-ubuntu-24.04/clean.sh @@ -1,6 +1,6 @@ #! /bin/bash -# SPDX-FileCopyrightText: 2021 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2024 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/vm-ubuntu-24.04/create-vm-image-for-others.md b/vm-ubuntu-24.04/create-vm-image-for-others.md index 7135f917..688c202a 100644 --- a/vm-ubuntu-24.04/create-vm-image-for-others.md +++ b/vm-ubuntu-24.04/create-vm-image-for-others.md @@ -1,5 +1,5 @@ diff --git a/vm-ubuntu-24.04/p4.vim b/vm-ubuntu-24.04/p4.vim index 1d081fb6..122e71bc 100644 --- a/vm-ubuntu-24.04/p4.vim +++ b/vm-ubuntu-24.04/p4.vim @@ -1,4 +1,4 @@ -" SPDX-FileCopyrightText: 2018 Contributors to the P4 Project +" SPDX-FileCopyrightText: 2017 Contributors to the P4 Project " " SPDX-License-Identifier: Apache-2.0 " Vim syntax file diff --git a/vm/root-bootstrap.sh b/vm/root-bootstrap.sh index 7ad9880b..dba6c697 100755 --- a/vm/root-bootstrap.sh +++ b/vm/root-bootstrap.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0 diff --git a/vm/user-bootstrap.sh b/vm/user-bootstrap.sh index 8d20a743..44af3f1a 100755 --- a/vm/user-bootstrap.sh +++ b/vm/user-bootstrap.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2017 Contributors to the P4 Project +# SPDX-FileCopyrightText: 2018 Contributors to the P4 Project # # SPDX-License-Identifier: Apache-2.0