diff options
Diffstat (limited to 'dynamic-layers')
88 files changed, 364 insertions, 1574 deletions
diff --git a/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend index 10b66c0e..b7bf3298 100644 --- a/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend +++ b/dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { rm -f ${D}${sysconfdir}/xdg/weston/weston.ini } diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc index cdd0f08f..b77fbc83 100644 --- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium-imx.inc +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc @@ -1,4 +1,4 @@ -DEPENDS_append_imxvpu = " imx-vpuwrap" +DEPENDS:append:imxvpu = " imx-vpuwrap" # Additional imx code and patches are included in the chromium-imx git repository. # The code below fetches this repository, copies the extra source over to the main @@ -14,7 +14,7 @@ CHROMIUM_IMX_COMMON_PATCHES ?= " " CHROMIUM_IMX_VPU_PATCHES ?= " " CHROMIUM_IMX_WAYLAND_PATCHES ?= " " -SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV}" +SRC_URI += "git://github.com/Freescale/chromium-imx.git;destsuffix=${CHROMIUM_IMX_DESTSUFFIX};branch=${CHROMIUM_IMX_BRANCH};rev=${CHROMIUM_IMX_SRCREV};protocol=https" do_unpack[postfuncs] += "copy_chromium_imx_files" # using =+ instead of += to make sure add_chromium_imx_patches is @@ -26,7 +26,7 @@ do_patch[prefuncs] =+ "add_chromium_imx_patches" # * Lost context problems are not known to happen with Vivante GPUs, # so it is safe to use ignore-lost-context # * Proprietary codecs need to be enabled for h.264 and MP4 support -PACKAGECONFIG_append = " ignore-lost-context proprietary-codecs" +PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs" copy_chromium_imx_files() { # sources in src/ are already organized in a manner @@ -41,4 +41,4 @@ python add_chromium_imx_patches() { d.appendVar('OZONE_WAYLAND_EXTRA_PATCHES', ' ' + d.getVar('CHROMIUM_IMX_WAYLAND_PATCHES', 1)) } -COMPATIBLE_MACHINE = "(mx6)" +COMPATIBLE_MACHINE = "(mx6-nxp-bsp)" diff --git a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch index 0329d42e..0329d42e 100644 --- a/dynamic-layers/browser-layer/recipes-browser/chromium/chromium/chromium.patch +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium/chromium.patch diff --git a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend index 1080a9f5..563c9e76 100644 --- a/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend +++ b/dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend @@ -4,7 +4,7 @@ PACKAGES += " \ ${PN}-f2fs \ " -RDEPENDS_${PN}-f2fs = " \ +RDEPENDS:${PN}-f2fs = " \ ${PN}-base \ f2fs-tools \ " diff --git a/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend new file mode 100644 index 00000000..fb90c73e --- /dev/null +++ b/dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend @@ -0,0 +1,5 @@ +PACKAGECONFIG:imxgpu3d ??= " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', \ + '', d), d)} \ +" diff --git a/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend new file mode 100644 index 00000000..e07d0d54 --- /dev/null +++ b/dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend @@ -0,0 +1,5 @@ +PACKAGECONFIG:imxgpu3d ??= " \ + cogl-pango gles2 \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \ + bb.utils.contains('DISTRO_FEATURES', 'x11', 'egl-x11', \ + '', d), d)}" diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend index 72d991c7..4fc41d05 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini index 6e8e0140..b1392871 100644 --- a/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini +++ b/dynamic-layers/ivi/recipes-graphics/wayland/weston-init/weston.ini @@ -2,12 +2,17 @@ shell=ivi-shell.so modules=hmi-controller.so #gbm-format=argb8888 +idle-time=0 #use-g2d=1 -#xwayland=true +#repaint-window=16 +#enable-overlay-view=1 #[shell] #size=1920x1080 +[libinput] +touchscreen_calibrator=true + [ivi-shell] ivi-shell-user-interface=weston-ivi-shell-user-interface diff --git a/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend new file mode 100644 index 00000000..7b7784ab --- /dev/null +++ b/dynamic-layers/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -0,0 +1,20 @@ +# List of supported machines from this layer +COMPATIBLE_MACHINE:imx8mm-lpddr4-evk = "imx8mm-lpddr4-evk" +TFA_BUILD_TARGET:imx8mm-lpddr4-evk = "all" +TFA_INSTALL_TARGET:imx8mm-lpddr4-evk = "bl31" +TFA_PLATFORM:imx8mm-lpddr4-evk = "imx8mm" + +COMPATIBLE_MACHINE:imx8mn-ddr4-evk = "imx8mn-ddr4-evk" +TFA_BUILD_TARGET:imx8mn-ddr4-evk = "all" +TFA_INSTALL_TARGET:imx8mn-ddr4-evk = "bl31" +TFA_PLATFORM:imx8mn-ddr4-evk = "imx8mn" + +COMPATIBLE_MACHINE:imx8mp-lpddr4-evk = "imx8mp-lpddr4-evk" +TFA_BUILD_TARGET:imx8mp-lpddr4-evk = "all" +TFA_INSTALL_TARGET:imx8mp-lpddr4-evk = "bl31" +TFA_PLATFORM:imx8mp-lpddr4-evk = "imx8mp" + +COMPATIBLE_MACHINE:imx8mq-evk = "imx8mq-evk" +TFA_BUILD_TARGET:imx8mq-evk = "all" +TFA_INSTALL_TARGET:imx8mq-evk = "bl31" +TFA_PLATFORM:imx8mq-evk = "imx8mq" diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch new file mode 100644 index 00000000..ab34dc2f --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire/0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch @@ -0,0 +1,41 @@ +From 2cac94185824aa7df07ec48a2872f3d26d517a6d Mon Sep 17 00:00:00 2001 +From: Shengjiu Wang <shengjiu.wang@nxp.com> +Date: Tue, 28 Nov 2023 10:23:42 +0800 +Subject: [PATCH] launch: allow pipewire-pulse can be started by root. + +revert commit 8942f6b40 ("launch: avoid autostarting pipewire-pulse +systemd units for root") + +Upstream-Status: Inappropriate [i.MX specific] +Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> +--- + src/daemon/systemd/user/pipewire-pulse.service.in | 1 - + src/daemon/systemd/user/pipewire-pulse.socket | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/src/daemon/systemd/user/pipewire-pulse.service.in b/src/daemon/systemd/user/pipewire-pulse.service.in +index 73d22e532..da7728ee3 100644 +--- a/src/daemon/systemd/user/pipewire-pulse.service.in ++++ b/src/daemon/systemd/user/pipewire-pulse.service.in +@@ -14,7 +14,6 @@ Description=PipeWire PulseAudio + # After=pipewire-pulse.socket is not needed, as it is already implicit in the + # socket-service relationship, see systemd.socket(5). + Requires=pipewire-pulse.socket +-ConditionUser=!root + Wants=pipewire.service pipewire-session-manager.service + After=pipewire.service pipewire-session-manager.service + Conflicts=pulseaudio.service +diff --git a/src/daemon/systemd/user/pipewire-pulse.socket b/src/daemon/systemd/user/pipewire-pulse.socket +index 1ae5edafb..d27fb0e26 100644 +--- a/src/daemon/systemd/user/pipewire-pulse.socket ++++ b/src/daemon/systemd/user/pipewire-pulse.socket +@@ -1,6 +1,5 @@ + [Unit] + Description=PipeWire PulseAudio +-ConditionUser=!root + Conflicts=pulseaudio.socket + + [Socket] +-- +2.34.1 + diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend new file mode 100644 index 00000000..7d84ee93 --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/pipewire/pipewire_%.bbappend @@ -0,0 +1,14 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append:imx-nxp-bsp = " file://0001-launch-allow-pipewire-pulse-can-be-started-by-root.patch" + +SYSTEMD_AUTO_ENABLE:imx-nxp-bsp = "disable" + +DEPENDS:append:mx95-nxp-bsp = " libdrm" + +PACKAGECONFIG:remove:mx95-nxp-bsp = "libcamera" +PACKAGECONFIG:remove:imx-nxp-bsp = "gstreamer" +PACKAGECONFIG:class-target:append:imx-nxp-bsp = " ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez-lc3', '', d)}" + +# FIXME: Needs to qualify on PACKAGECONFIG +SYSTEMD_SERVICE:${PN}-pulse = "pipewire-pulse.service" diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend new file mode 100644 index 00000000..b85752b7 --- /dev/null +++ b/dynamic-layers/multimedia-layer/recipes-multimedia/vlc/vlc_%.bbappend @@ -0,0 +1,2 @@ +# vivante drivers does not provide glx +PACKAGECONFIG:remove:imxgpu = "x11" diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/README b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/README deleted file mode 100644 index 9578982d..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/README +++ /dev/null @@ -1,77 +0,0 @@ -test_setkey script usage - -The scripts in this directory may be used for testing -native Linux IPsec with the talitos driver as a loadable module. - -It's assumed that these scripts have been placed in the directory -named /test_setkey. - -The scripts setup_left and setup_right configure the ip addresses -for two boards named 'left' and 'right', which are two gateways for -an IPsec tunnel. Connect the eth1 interfaces of left and right boards together. -For smartbits testing, connect eth0 on each board to a smartbits port. -For other testing (ping, netperf, iperf), connect eth0 on each board to another system. - -The scripts named left.conf-* and right.conf-* are setkey scripts -which configure the IPsec SA and SPD entries. -The scripts ending in -tunnel use tunnel mode IPsec, and the scripts -ending in -transport used transport mode IPsec. -Transport mode is useful for quickly testing security functionality -using ping or netperf between two boards. -Tunnel mode can be used for testing throughput using smartbits or other -performance test equipment. - -There is a top level script called 'setup' which -is used for a one-step setup on the left and right boards. -'setup' uses two or three parameters. The first parameter is the side, left or right. -The second parameter is the setkey suffix for the left.conf- and right.conf- files. -If the third parameter is supplied, the setup will modprobe that name, so -typically you should provide talitos as the third parameter if you want to load the driver. -If you have built the talitos driver into the kernel, omit the third parameter to setup. -You may test software encryption if talitos is built as a module and you omit the third parameter. - -Below are example uses of the 'setup' script. - -1) One-step setup for smartbits - Use a tunnel mode setup on each side. - AES-HMAC-SHA1: - Left side: - /test_setkey/setup left aes-sha1-tunnel talitos - Right side: - /test_setkey/setup right aes-sha1-tunnel talitos - - 3DES-HMAC-SHA1: - Left side: - /test_setkey/setup left 3des-sha1-tunnel talitos - Right side: - /test_setkey/setup right 3des-sha1-tunnel talitos - -2) One-step setup for testing ping, netperf, or iperf between two boards. - Use a transport mode setup on each side. - AES-HMAC-SHA1: - Left side: - /test_setkey/setup left aes-sha1-transport talitos - Right side: - /test_setkey/setup right aes-sha1-transport talitos - - 3DES-HMAC-SHA1: - Left side: - /test_setkey/setup left 3des-sha1-transport talitos - Right side: - /test_setkey/setup right 3des-sha1-transport talitos - -3) Testing ipv4 - To test ipv4 (with no security) over the two gateways, use steps below. - Testing ipv4 is helpful to get your smartbits configuration verified - and also establish a baseline performance for throughput. - - On the left board: - cd /test_setkey - ./setup_left - ./left.ipv4 - - On the right board: - cd /test_setkey - ./setup_right - ./right.ipv4 - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_left.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_left.conf-3des-sha1-tunnel deleted file mode 100755 index 6bd6c5d8..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_left.conf-3des-sha1-tunnel +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_right.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_right.conf-3des-sha1-tunnel deleted file mode 100755 index eebf307a..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/auto_right.conf-3des-sha1-tunnel +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/flush-setkey b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/flush-setkey deleted file mode 100755 index 0be30562..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/flush-setkey +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/sbin/setkey -f - -flush; -spdflush; diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.left deleted file mode 100644 index d9d6c0c6..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.left +++ /dev/null @@ -1,29 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - charondebug="chd 2, knl 2" - crlcheckinterval=180 - strictcrlpolicy=no - plutostart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev2 - type=tunnel - auth=esp - compress=no - mobike=no - -conn net-net - left=200.200.200.10 - leftsubnet=192.168.1.0/24 - leftcert=moonCert.pem - leftid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - leftfirewall=yes - right=200.200.200.20 - rightsubnet=192.168.2.0/24 - rightid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.right deleted file mode 100644 index c14dee2b..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.conf.right +++ /dev/null @@ -1,28 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - charondebug="chd 2, knl 2" - crlcheckinterval=180 - strictcrlpolicy=no - plutostart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev2 - auth=esp - compress=no - mobike=no - -conn net-net - left=200.200.200.20 - leftcert=sunCert.pem - leftid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - leftsubnet=192.168.2.0/24 - leftfirewall=yes - right=200.200.200.10 - rightid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - rightsubnet=192.168.1.0/24 - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.left deleted file mode 100644 index e86d6aa5..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.left +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/ipsec.secrets - strongSwan IPsec secrets file - -: RSA moonKey.pem diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.right deleted file mode 100644 index 1095b74c..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec.secrets.right +++ /dev/null @@ -1,8 +0,0 @@ -# /etc/ipsec.secrets - strongSwan IPsec secrets file - -: RSA sunKey.pem - - - - - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.left deleted file mode 100644 index 55025dbc..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.left +++ /dev/null @@ -1,39 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - plutodebug=control - crlcheckinterval=180 - strictcrlpolicy=no - charonstart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev1 - left=200.200.200.10 - leftcert=moonCert.pem - leftid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - leftfirewall=yes - -conn net-net - left=%defaultroute - leftsubnet=192.168.1.0/24 - leftcert=moonCert.pem - right=200.200.200.20 - rightsubnet=192.168.2.0/24 - rightid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - auto=add - -conn host-host - left=%defaultroute - leftcert=moonCert.pem - right=200.200.200.20 - rightid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - auto=add - -conn rw - leftsubnet=192.168.1.0/24 - right=%any - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.right deleted file mode 100644 index 479791ea..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/ipsec_ikev1.conf.right +++ /dev/null @@ -1,34 +0,0 @@ -# /etc/ipsec.conf - strongSwan IPsec configuration file - -config setup - plutodebug=control - crlcheckinterval=180 - strictcrlpolicy=no - charonstart=no - -conn %default - ikelifetime=60m - keylife=20m - rekeymargin=3m - keyingtries=1 - keyexchange=ikev1 - left=200.200.200.20 - leftcert=sunCert.pem - leftid="C=CH, O=Linux strongSwan, CN=sun.strongswan.org" - leftfirewall=yes - -conn net-net - left=%defaultroute - leftsubnet=192.168.2.0/24 - leftcert=sunCert.pem - right=200.200.200.10 - rightsubnet=192.168.1.0/24 - rightid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - auto=add - -conn host-host - left=%defaultroute - leftcert=sunCert.pem - right=200.200.200.10 - rightid="C=CH, O=Linux strongSwan, CN=moon.strongswan.org" - auto=add diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-transport deleted file mode 100755 index 5422771b..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-tunnel deleted file mode 100755 index 52bf9c3f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-transport deleted file mode 100755 index e5ee0054..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-tunnel deleted file mode 100755 index eb2881db..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha1-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-transport deleted file mode 100755 index b5286320..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-tunnel deleted file mode 100755 index e7726f08..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-3des-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-transport deleted file mode 100755 index 96f57837..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-tunnel deleted file mode 100755 index b2cf84bf..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-transport deleted file mode 100755 index f3ffaf5c..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-tunnel deleted file mode 100755 index 1ab7874f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha1-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-transport deleted file mode 100755 index d2645d6f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-tunnel deleted file mode 100755 index 8ed697d1..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-aes-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-transport deleted file mode 100755 index 84275d07..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.10 - -flush; -spdflush; - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E null - -A null; - - -spdadd 200.200.200.20 200.200.200.10 any -P in ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P out ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-tunnel deleted file mode 100755 index 478d14a8..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.conf-null-null-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway A (eth0:192.168.1.130, eth1:200.200.200.10) -# -# Security policies -spdadd 192.168.1.0/24 192.168.2.0/24 any -P out ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P in ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E null - -A null; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.ipv4 b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.ipv4 deleted file mode 100755 index e219f2ad..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/left.ipv4 +++ /dev/null @@ -1,2 +0,0 @@ -set -v -route add -net 192.168.2.0 netmask 255.255.255.0 gw 200.200.200.20 diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonCert.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonCert.pem deleted file mode 100644 index d5c970f4..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonCert.pem +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEIjCCAwqgAwIBAgIBFzANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ -MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS -b290IENBMB4XDTA5MDgyNzEwMDMzMloXDTE0MDgyNjEwMDMzMlowRjELMAkGA1UE -BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xHDAaBgNVBAMTE21vb24u -c3Ryb25nc3dhbi5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDK -L2M91Lu6BYYhWxWgMS9z9TMSTwszm5rhO7ZIsCtMRo4PAeYw+++SGXt3CPXb/+p+ -SWKGlm11rPE71eQ3ehgh2C3hAurfmWO0iQQaCw+fdreeIVCqOQIOP6UqZ327h5yY -YpHk8VQv4vBJTpxclU1PqnWheqe1ZlLxsW773LRml/fQt/UgvJkCBTZZONLNMfK+ -7TDnYaVsAtncgvDN78nUNEe2qY92KK7SrBJ6SpUEg49m51F+XgsGcsgWVHS85on3 -Om/G48crLEVJjdu8CxewSRVgb+lPJWzHd8QsU0Vg/7vlqs3ZRMyNtNKrr4opSvVb -A6agGlTXhDCreDiXU8KHAgMBAAGjggEaMIIBFjAJBgNVHRMEAjAAMAsGA1UdDwQE -AwIDqDAdBgNVHQ4EFgQUapx00fiJeYn2WpTpifH6w2SdKS4wbQYDVR0jBGYwZIAU -XafdcAZRMn7ntm2zteXgYOouTe+hSaRHMEUxCzAJBgNVBAYTAkNIMRkwFwYDVQQK -ExBMaW51eCBzdHJvbmdTd2FuMRswGQYDVQQDExJzdHJvbmdTd2FuIFJvb3QgQ0GC -AQAwHgYDVR0RBBcwFYITbW9vbi5zdHJvbmdzd2FuLm9yZzATBgNVHSUEDDAKBggr -BgEFBQcDATA5BgNVHR8EMjAwMC6gLKAqhihodHRwOi8vY3JsLnN0cm9uZ3N3YW4u -b3JnL3N0cm9uZ3N3YW4uY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQCctXg2xeMozaTV -jiBL1P8MY9uEH5JtU0EceQ1RbI5/2vGRdnECND9oADY5vamaaE2Mdq2Qh/vlXnML -o3ii5ELjsQlYdTYZOcMOdcUUXYvbbFX1cwpkBhyBl1H25KptHcgQ/HnceKp3kOuq -wYOYjgwePXulcpWXx0E2QtQCFQQZFPyEWeNJxH0oglg53QPXfHY9I2/Gukj5V0bz -p7ME0Gs8KdnYdmbbDqzQgPsta96/m+HoJlsrVF+4Gqihj6BWMBQ2ybjPWZdG3oH9 -25cE8v60Ry98D0Z/tygbAUFnh5oOvaf642paVgc3aoA77I8U+UZjECxISoiHultY -7QTufOwP ------END CERTIFICATE----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonKey.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonKey.pem deleted file mode 100644 index 4d99866f..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/moonKey.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAyi9jPdS7ugWGIVsVoDEvc/UzEk8LM5ua4Tu2SLArTEaODwHm -MPvvkhl7dwj12//qfklihpZtdazxO9XkN3oYIdgt4QLq35ljtIkEGgsPn3a3niFQ -qjkCDj+lKmd9u4ecmGKR5PFUL+LwSU6cXJVNT6p1oXqntWZS8bFu+9y0Zpf30Lf1 -ILyZAgU2WTjSzTHyvu0w52GlbALZ3ILwze/J1DRHtqmPdiiu0qwSekqVBIOPZudR -fl4LBnLIFlR0vOaJ9zpvxuPHKyxFSY3bvAsXsEkVYG/pTyVsx3fELFNFYP+75arN -2UTMjbTSq6+KKUr1WwOmoBpU14Qwq3g4l1PChwIDAQABAoIBACBFB/Xqajv6fbn9 -K6pxrz02uXwGmacXAtVIDoPzejWmXS4QA4l17HrJDmelSnhelDKry8nnYHkTrTz7 -mn0wQ4HDWy86o/okJUG/TKRLd6bf79aRQqqohqd3iQkHk43GyzuXH+oGioVKF0fc -ACDWw4wfjL7FMNdHCZ4Bz9DrHO/ysHe9B6rvSYm3VZRhSxaneIkaLkkDadKpVx3f -XNFlMxY4qKPJYYSoJZ61iMqrO7+rnA93tmyDDs8PKU3BtnpfNrdePgleJHhk8Zqy -Ev2/NOCSUxbKE8NCtLpGTs+T0qjjnu4k3WPd3ZOBAan0uPDekHZeHB/aXGLhYcxx -J5SurqECgYEA+F1gppkER5Jtoaudt/CUpdQ1sR9wxf75VBqJ4FiYABGQz9xlG4oj -zL/o572s0iV3bwFpnQa+WuWrxGkP6ZuB/Z82npc0N/vLou/b4dxvg4n7K+eOOEf0 -8FMjsse2tqTIXKCqcmQnR0NPQ1jwuvEKsXP5w/JOlnRXAXnd4jxsJI0CgYEA0GaT -61ySttUW9jC3mxuY6jkQy8TEQqR3nOFvWwmCXIWOpN/MTTPus+Telxp/pdKhU+mo -PmX3Unyne5PvwleWDq3YzltX5ZDZGJ5UJlKuNnfGIzQ6OcHRbb7zBpQG6qSRPuug -bgo688hTnb1L59nK88zWVK45euf6pyuoI+SwIGMCgYEA7yvE8knyhBXvezuv0z1b -eGHmHp5/VDwY0DQKSEAoiBBiWrkLqLybgwXf/KJ8dZZc8En08aFX2GLJyYe/KiB1 -ys3ypEBJqgvRayP+o/9KZ+qNNRd0rqAksPXvL7ABNNt0kzapTSVDae3Yu6s/j1am -DIL5qAeERIDedG5uDPpQzdUCgYB7MtjpP63ABhLv8XbpbBQnCxtByw3W89F+Xcrt -v55gQdhE4cSuMzA/CuMH4vNpPS6AI9aBJNhj3CtKo/cOJachAGb1/wvkO5ALvLW0 -fhZdPstUTnDJain7vfF/hwzbs/PlhXgu9T9KlLfRvXFdG+Sd4g8mumRiozcLkoRw -y6XPTwKBgDJP+s9wXmdG90HST/aqC7FKrVXLpB63dY5swNUfQP6sa0pFnON0r0JC -h/YCsGFFIAebQ2uOkM3g3f9nkwTp7910ov+/5uThvRI2w2BBPy0mVuALPjyyF1Z2 -cb9zpyKiIuXoXRCf4sd8r1lR9bn0Fxx0Svpxf+fpMGSI5quHNBKY ------END RSA PRIVATE KEY----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizes.sh b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizes.sh deleted file mode 100755 index faefb245..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizes.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Usage: ./pingsizes.sh 1440 20 (or greater) -# - -PINGDEST=${PINGDEST:-200.200.200.10} -k=$1 -lim="$((k+$2))" -((k-=1)) -while [ "$k" != "$lim" ] ; do - echo -n "ping -s $((k+=1)) : " - ping -i 1000 -c 1 -s $k $PINGDEST | grep packets & - sleep 1 - PID=`ps -eaf | grep 'ping -i' | grep -v grep | sed 's/[ ][ ]*/ /g' | cut -d " " -f 2` - if [ -n "$PID" ] ; then - echo "****************** killing $PID" - kill $PID > /dev/null - fi -done diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizest.sh b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizest.sh deleted file mode 100755 index d5ff0f7d..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/pingsizest.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# Usage: ./pingsizes.sh 1440 20 (or greater) -# - -PINGDEST=${PINGDEST:-200.200.200.10} -k=$1 -lim="$((k+$2))" -((k-=1)) -while [ "$k" != "$lim" ] ; do - echo ping -s $((k+=1)) - ping -i 1000 -c 1 -s $k $PINGDEST & - sleep 1 - PID=`ps -eaf | grep 'ping -i' | sed 's/[ ][ ]*/ /g' | cut -d " " -f 2` - if [ -n "$PID" ] ; then - echo "****************** killing $PID" - kill $PID - fi -done diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/psk.txt b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/psk.txt deleted file mode 100644 index 46c1ff41..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/psk.txt +++ /dev/null @@ -1,2 +0,0 @@ -200.200.200.20 secretkeyracoon -200.200.200.10 secretkeyracoon diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/racoon.conf b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/racoon.conf deleted file mode 100644 index cf561f51..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/racoon.conf +++ /dev/null @@ -1,22 +0,0 @@ -path pre_shared_key "/test_setkey/psk.txt" ; - - remote anonymous - { - exchange_mode main ; - lifetime time 1 hour ; - proposal { - encryption_algorithm 3des; - hash_algorithm sha1; - authentication_method pre_shared_key ; - dh_group 2 ; - } - } - - sainfo anonymous - { - pfs_group 2; - lifetime time 1 hour ; - encryption_algorithm 3des ; - authentication_algorithm hmac_sha1 ; - compression_algorithm deflate ; - } diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-transport deleted file mode 100755 index 7f82fb46..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-tunnel deleted file mode 100755 index 5a752579..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-transport deleted file mode 100755 index 6ef885d4..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -# Security policies -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-tunnel deleted file mode 100755 index 16c31578..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha1-tunnel +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-transport deleted file mode 100755 index b9772092..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-tunnel deleted file mode 100755 index e7c5b4e6..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-3des-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-transport deleted file mode 100755 index 5d55d001..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-tunnel deleted file mode 100755 index f49bd54a..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-md5-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-md5 authentication using 128 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-md5 0xd5f603abc8cd9d19319ca32fb955b10f; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-md5 0x1dd90b4c32dcbe9d37b555a23df5170e; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-transport deleted file mode 100755 index d9c65a45..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-transport +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - -# Security policies -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-tunnel deleted file mode 100755 index 1f10136a..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha1-tunnel +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies - -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha1 authentication using 160 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha1 0xe9c43acd5e8d779b6e09c87347852708ab49bdd3; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha1 0xea6856479330dc9c17b8f6c37e2a895363d83f21; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-transport deleted file mode 100755 index 817a8bd4..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-tunnel deleted file mode 100755 index 9bca18fb..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-aes-sha256-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board A setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing encryption using 192 bit long keys (168 + 24 parity) -# and hmac-sha2-256 authentication using 256 bit long keys -add 200.200.200.10 200.200.200.20 esp 0x10513 -m tunnel - -E aes-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831 - -A hmac-sha2-256 0x4de03bebf6beb4fdef5a67d349a09580466cc4e54503333b2a5fd34538c91198; - -add 200.200.200.20 200.200.200.10 esp 0x10514 -m tunnel - -E aes-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df - -A hmac-sha2-256 0x5e01eb780b7ecc074ca2ca4fa4a5ea2ff841c977da0ce61c49d1fe767ea5452c; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-transport b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-transport deleted file mode 100755 index 26dfe2e1..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-transport +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/sbin/setkey -f -#I am 200.200.200.20 - -flush; -spdflush; - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x10513 - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x10514 - -E null - -A null; - - -spdadd 200.200.200.20 200.200.200.10 any -P out ipsec - esp/transport//require; - -spdadd 200.200.200.10 200.200.200.20 any -P in ipsec - esp/transport//require; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-tunnel b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-tunnel deleted file mode 100755 index bc4f38eb..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.conf-null-null-tunnel +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/sbin/setkey -f -# -# -# Example ESP Tunnel for VPN. -# -# ========= ESP ========= -# | | -# Network-A Gateway-A Gateway-B Network-B -# 192.168.1.0/24 ---- 200.200.200.10 ------ 200.200.200.20 ---- 192.168.2.0/24 -# -# ====== 83xx board A ====== ===== 83xx board B ===== -# | | | | -# eth0 eth1 eth1 eth0 -# 192.168.1.130 200.200.200.10 200.200.200.20 192.168.2.130 -# -# -# Board B setup -# -# Flush the SAD and SPD -flush; -spdflush; - -# I am gateway B (eth0:192.168.2.130, eth1:200.200.200.20) -# -# Security policies -spdadd 192.168.2.0/24 192.168.1.0/24 any -P out ipsec - esp/tunnel/200.200.200.20-200.200.200.10/require; - -spdadd 192.168.1.0/24 192.168.2.0/24 any -P in ipsec - esp/tunnel/200.200.200.10-200.200.200.20/require; - - -# ESP SAs doing null encryption -# and null authentication -add 200.200.200.10 200.200.200.20 esp 0x201 -m tunnel - -E null - -A null; - -add 200.200.200.20 200.200.200.10 esp 0x301 -m tunnel - -E null - -A null; - diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.ipv4 b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.ipv4 deleted file mode 100755 index 67cd1b2c..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/right.ipv4 +++ /dev/null @@ -1,2 +0,0 @@ -set -v -route add -net 192.168.1.0 netmask 255.255.255.0 gw 200.200.200.10 diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup deleted file mode 100755 index 9e6fa7fa..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup +++ /dev/null @@ -1,47 +0,0 @@ -# setup - quick setup for left or right side of ipsec test -# see README for example use. - -SCRIPT_HOME=/test_setkey/ -cd $SCRIPT_HOME - -export PATH=$SCRIPT_HOME:$PATH - -if [ "$1" != "left" -a "$1" != "right" ] ; then - echo "Usage: $0 side [config] [driver]" - echo " where side is either left or right." - echo " where config is either" - echo " aes-sha1-tunnel (default)" - echo " or 3des-sha1-tunnel" - echo " if driver is supplied, script does 'modprobe driver'" - exit 1 -fi - -SIDE=$1 -POLICY_CFG=$SIDE.conf -DEFAULT_POLICY=aes-sha1-tunnel - -if [ -n "$2" ] ; then - POLICY=$2 -else - POLICY=$DEFAULT_POLICY -fi - -SETKEY_FILE=$POLICY_CFG-$POLICY - -if [ ! -f $SETKEY_FILE ] ; then - echo "Missing setkey command file: $SETKEY_FILE" - exit 1 -fi - -# modprobe any driver name given as last parameter -if [ -n "$3" ] ; then - modprobe $3 -fi - -SETUP_CMD_FILE=./setup_$SIDE -. $SETUP_CMD_FILE - -$SETKEY_FILE - -setkey -D -setkey -D -P diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_left deleted file mode 100755 index da769099..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_left +++ /dev/null @@ -1,13 +0,0 @@ -# board on left setup -set -v -ifconfig eth0 down -ifconfig eth0 hw ether 00:04:9F:11:22:33 -ifconfig eth0 192.168.1.130 netmask 255.255.255.0 -ifconfig eth0 up -ifconfig eth1 down -ifconfig eth1 hw ether 00:E0:0C:00:7D:FD -ifconfig eth1 200.200.200.10 netmask 255.255.255.0 -ifconfig eth1 up -arp -s 192.168.1.21 00:00:00:00:00:01 -route add default dev eth1 -echo 1 > /proc/sys/net/ipv4/ip_forward diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_right deleted file mode 100755 index f0e333ee..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/setup_right +++ /dev/null @@ -1,13 +0,0 @@ -# board on right setup -set -v -ifconfig eth0 down -ifconfig eth0 hw ether 00:E0:0C:00:01:FD -ifconfig eth0 192.168.2.130 netmask 255.255.255.0 -ifconfig eth0 up -ifconfig eth1 down -ifconfig eth1 hw ether 00:E0:0C:00:00:FD -ifconfig eth1 200.200.200.20 netmask 255.255.255.0 -ifconfig eth1 up -arp -s 192.168.2.21 00:00:00:00:00:02 -route add default dev eth1 -echo 1 > /proc/sys/net/ipv4/ip_forward diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan.conf b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan.conf deleted file mode 100644 index 1701f4ab..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan.conf +++ /dev/null @@ -1,19 +0,0 @@ -# strongswan.conf - strongSwan configuration file - -charon { - load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random x509 revocation hmac xcbc stroke kernel-netlink socket-raw updown - multiple_authentication = no -} - -pluto { - - # plugins to load in pluto - #load = aes des sha1 md5 sha2 hmac gmp random pubkey - -} - -libstrongswan { - - # set to no, the DH exponent size is optimized - # dh_exponent_ansi_x9_42 = no -} diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswanCert.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswanCert.pem deleted file mode 100644 index 0865ad22..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswanCert.pem +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDuDCCAqCgAwIBAgIBADANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ -MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS -b290IENBMB4XDTA0MDkxMDEwMDExOFoXDTE5MDkwNzEwMDExOFowRTELMAkGA1UE -BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN0cm9u -Z1N3YW4gUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y -X2LqPVZuWLPIeknK86xhz6ljd3NNhC2z+P1uoCP3sBMuZiZQEjFzhnKcbXxCeo2f -FnvhOOjrrisSuVkzuu82oxXD3fIkzuS7m9V4E10EZzgmKWIf+WuNRfbgAuUINmLc -4YGAXBQLPyzpP4Ou48hhz/YQo58Bics6PHy5v34qCVROIXDvqhj91P8g+pS+F21/ -7P+CH2jRcVIEHZtG8M/PweTPQ95dPzpYd2Ov6SZ/U7EWmbMmT8VcUYn1aChxFmy5 -gweVBWlkH6MP+1DeE0/tL5c87xo5KCeGK8Tdqpe7sBRC4pPEEHDQciTUvkeuJ1Pr -K+1LwdqRxo7HgMRiDw8CAwEAAaOBsjCBrzASBgNVHRMBAf8ECDAGAQH/AgEBMAsG -A1UdDwQEAwIBBjAdBgNVHQ4EFgQUXafdcAZRMn7ntm2zteXgYOouTe8wbQYDVR0j -BGYwZIAUXafdcAZRMn7ntm2zteXgYOouTe+hSaRHMEUxCzAJBgNVBAYTAkNIMRkw -FwYDVQQKExBMaW51eCBzdHJvbmdTd2FuMRswGQYDVQQDExJzdHJvbmdTd2FuIFJv -b3QgQ0GCAQAwDQYJKoZIhvcNAQELBQADggEBACOSmqEBtBLR9aV3UyCI8gmzR5in -Lte9aUXXS+qis6F2h2Stf4sN+Nl6Gj7REC6SpfEH4wWdwiUL5J0CJhyoOjQuDl3n -1Dw3dE4/zqMZdyDKEYTU75TmvusNJBdGsLkrf7EATAjoi/nrTOYPPhSUZvPp/D+Y -vORJ9Ej51GXlK1nwEB5iA8+tDYniNQn6BD1MEgIejzK+fbiy7braZB1kqhoEr2Si -7luBSnU912sw494E88a2EWbmMvg2TVHPNzCpVkpNk7kifCiwmw9VldkqYy9y/lCa -Epyp7lTfKw7cbD04Vk8QJW782L6Csuxkl346b17wmOqn8AZips3tFsuAY3w= ------END CERTIFICATE----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_left b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_left deleted file mode 100755 index e55c3e42..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_left +++ /dev/null @@ -1,10 +0,0 @@ -#strongswan on left board -set -v -cp -rf ipsec.conf.left /etc/ipsec.conf -cp -rf ipsec.secrets.left /etc/ipsec.secrets -cp -rf strongswan.conf /etc/ -cp -rf strongswanCert.pem /etc/ipsec.d/cacerts/ -cp -rf moonCert.pem /etc/ipsec.d/certs/ -mkdir /etc/ipsec.d/private -cp -rf sunKey.pem /etc/ipsec.d/private/ -cp -rf moonKey.pem /etc/ipsec.d/private/ diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_right b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_right deleted file mode 100755 index bcdbb731..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/strongswan_right +++ /dev/null @@ -1,10 +0,0 @@ -#strongswan on left board -set -v -cp -rf ipsec.conf.right /etc/ipsec.conf -cp -rf ipsec.secrets.right /etc/ipsec.secrets -cp -rf strongswan.conf /etc/ -cp -rf strongswanCert.pem /etc/ipsec.d/cacerts/ -cp -rf sunCert.pem /etc/ipsec.d/certs/ -mkdir /etc/ipsec.d/private -cp -rf sunKey.pem /etc/ipsec.d/private/ -cp -rf moonKey.pem /etc/ipsec.d/private/ diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunCert.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunCert.pem deleted file mode 100644 index d0937bab..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunCert.pem +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIBFjANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJDSDEZ -MBcGA1UEChMQTGludXggc3Ryb25nU3dhbjEbMBkGA1UEAxMSc3Ryb25nU3dhbiBS -b290IENBMB4XDTA5MDgyNzA5NTkwNFoXDTE0MDgyNjA5NTkwNFowRTELMAkGA1UE -BhMCQ0gxGTAXBgNVBAoTEExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN1bi5z -dHJvbmdzd2FuLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+V -VIpn6Q5jaU//EN6p6A5cSfUfhBK0mFa2laFFZh/Y0h66AXqqrQ3X917h7YNsSk68 -oowY9h9I3gOx7hNVBsJr2VjdYC+b0q5NTha09/A5mimv/prYj6o0yawxoPjoDs9Y -h7D7Kf+F8fkgk0stlHJZX66J7dNrFXbg1xBld+Ep5Or2FbEZ9QWUpRQTuhdpNt/4 -9YuxQ59DemY9IRbwsrKCHH0mGrJsDdqeb0ap+8QvSXHjCt1fr9MNKWaAFAQLKQI4 -e0da1ntPCEQLeE833+NNRBgGufk0KqGT3eAXqrxa9AEIUJnVcPexQdqUMjcUpXFb -8WNzRWB8Egh3BDK6FsECAwEAAaOCARkwggEVMAkGA1UdEwQCMAAwCwYDVR0PBAQD -AgOoMB0GA1UdDgQWBBRW1p4v2qihzRlcI1PnxbZwluML+zBtBgNVHSMEZjBkgBRd -p91wBlEyfue2bbO15eBg6i5N76FJpEcwRTELMAkGA1UEBhMCQ0gxGTAXBgNVBAoT -EExpbnV4IHN0cm9uZ1N3YW4xGzAZBgNVBAMTEnN0cm9uZ1N3YW4gUm9vdCBDQYIB -ADAdBgNVHREEFjAUghJzdW4uc3Ryb25nc3dhbi5vcmcwEwYDVR0lBAwwCgYIKwYB -BQUHAwEwOQYDVR0fBDIwMDAuoCygKoYoaHR0cDovL2NybC5zdHJvbmdzd2FuLm9y -Zy9zdHJvbmdzd2FuLmNybDANBgkqhkiG9w0BAQsFAAOCAQEAo37LYT9Awx0MK/nA -FZpPJqUr0Ey+O5Ukcsdx7nd00SlmpiQRY8KmuRXCBQnDEgdLstd3slQjT0pJEgWF -0pzxybnI6eOzYAhLfhart+X1hURiNGbXjggm2s4I5+K32bVIkNEqlsYnd/6F9oo5 -ZNO0/eTTruLZfkNe/zchBGKe/Z7MacVwlYWWCbMtBV4K1d5dGcRRgpQ9WivDlmat -Nh9wlscDSgSGk3HJkbxnq695VN7zUbDWAUvWWhV5bIDjlAR/xyT9ApqIxiyVVRul -fYrE7U05Hbt6GgAroAKLp6qJup9+TxQAKSjKIwJ0hf7OuYyQ8TZtVHS7AOhm+T/5 -G/jGGA== ------END CERTIFICATE----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunKey.pem b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunKey.pem deleted file mode 100644 index d8fad9aa..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo/test_setkey/sunKey.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA35VUimfpDmNpT/8Q3qnoDlxJ9R+EErSYVraVoUVmH9jSHroB -eqqtDdf3XuHtg2xKTryijBj2H0jeA7HuE1UGwmvZWN1gL5vSrk1OFrT38DmaKa/+ -mtiPqjTJrDGg+OgOz1iHsPsp/4Xx+SCTSy2Ucllfront02sVduDXEGV34Snk6vYV -sRn1BZSlFBO6F2k23/j1i7FDn0N6Zj0hFvCysoIcfSYasmwN2p5vRqn7xC9JceMK -3V+v0w0pZoAUBAspAjh7R1rWe08IRAt4Tzff401EGAa5+TQqoZPd4BeqvFr0AQhQ -mdVw97FB2pQyNxSlcVvxY3NFYHwSCHcEMroWwQIDAQABAoIBADH51hjN2zk9HVgl -QmcTAWzcUie5cLMhrP+M9mtC8O3jcCwwFY6OwfnbMU8DHy0GMqHg5lB8b99UUVPw -HLAzjDw/ESkc6pgZs4EEhJTsxJLsvTnePgHssEgyXnXf7gRVEqJkPohfy+Zy0UCH -eIUQXiMlOQ7xg7iDMhwNa+UdWSt539DztSKilQn2xdPZjFnMT0/prvl4NA/8Zn54 -/SdWDq5yRdLWb6EK1V7yJ3687GXR1jzGtgy7TXuncUJVTYgX7RdP1Tn6gWD8YAQ/ -RfT0DdWYm4WHSgSb9/NW8lBZH2yy3hg+lNgofXEvTfBkO5QyW31LIr0tCV6zhJIc -Y9MxaKUCgYEA9sktaXfhPLe0ECjdeQEOq5EKuDrCviSKCOuAV4BDSOsdw6+5LWfY -Vb/oke8N70lL3RCblcj1pOKWUi2O/SpEJdDRduiw2gM9cXt3/bChSTHC4TsIxxN/ -Db9OGg72kZ4sRY5Au+zyAAQYBwXhFWux194Jk5qK0JblNG9J5QMqZDcCgYEA5+5h -BgHUMEO+pdME5lAiSc5PcNTejpA6j+OikCh4/HFXy3C/dLx+Cs1+egw64c8iVaIv -NEo7n7E9I0e3XqanPRXhMnBRrP+39OVsWPmZ18Li2Hi84KwJyi8Y11l3XJOqaYpF -wMVUuZpxR0dfG5k/5GwT/tEkmQBglOgG3m2zUMcCgYEA4m3Vd9ahV5dp5AXKpzKc -JjiPMFfhxJo7+FEz0ZUCp03qYljBu/Jy4MKS/grrqyiCLdQGHNlk4SNxLvdUId78 -5gGBnuuDEJU2dAAIKUE9yq2YlBUZSacOxStI2snt28/X6P3LUWHm7LLU5OS1D3Vf -mKPF/6MlSJuas5CEqVZNN+MCgYBH9Qh7IaQgmVQUBKVXg3Mv7OduvUyTdKIGtHxi -N3xZ7hxsDP4JjNWaKmlcGmFGX8pqQRheI83d3NJ4GK8GmbP3Wst0p65fezMqsudr -r30QmPFicgs/tYCQDw6o+aPzwAi2F+VOSqrfrtAIaldSq7hL+VA21dKB+cD9UgOX -jPd+TwKBgQCbKeg2QNS2qhPIG9eaqJDROuxmxb/07d7OBctgMgxVvKhqW9hW42Sy -gJ59fyz5QjFBaSfcOdf4gkKyEawVo45/q6ymIQU37R4vF4CW9Z3CfaIbwJp7LcHV -zH07so/HNsZua6GWCSCLJU5MeCRiZzk2RFiS9KIaLP4gZndv4lXOiQ== ------END RSA PRIVATE KEY----- diff --git a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb b/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb deleted file mode 100644 index 1a4ae6dd..00000000 --- a/dynamic-layers/networking-layer/recipes-connectivity/ipsec-demo/ipsec-demo_0.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Scripts and configuration files for ipsec demo" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -RDEPENDS_${PN} = "ipsec-tools bash" - -inherit allarch - -SRC_URI = "file://test_setkey" - -S = "${WORKDIR}" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install(){ - install -d ${D}${datadir} - cp -a ${WORKDIR}/test_setkey ${D}${datadir}/ - chown -R root:root ${D}${datadir}/test_setkey -} - -FILES_${PN} = "${datadir}/*" - -COMPATIBLE_MACHINE = "(qoriq)" -PACKAGE_ARCH = "${MACHINE_SOCARCH}" - diff --git a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend index 2e648ba3..4cfa51ea 100644 --- a/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend @@ -1,4 +1,4 @@ # Only _mx8 machine do provide virtual/libgbm required for any drm* flavour -DRM-REMOVE_imxgpu = "drm-gl drm-gles2" -DRM-REMOVE_imxgpu_mx8 = "" -PACKAGECONFIG_remove = "${DRM-REMOVE}" +DRM-REMOVE:imxgpu = "drm-gl drm-gles2" +DRM-REMOVE:imxgpu:mx8-nxp-bsp = "" +PACKAGECONFIG:remove = "${DRM-REMOVE}" diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch new file mode 100644 index 00000000..a3f5c828 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-devtools/cst/files/0001-fix-err-msg-linking.patch @@ -0,0 +1,56 @@ +NXP uses weaken to solve conflict in linking. +On Ubuntu 22.04(LTS) this fails to link cst with libcrypto. + +The patch fixes the conflict in the code itself. +It restricts the scope of err_msg to the module. + +Upstream-Status: Inappropriate [i.MX specific] +Signed-off-by: Walter Schweizer <walter.schweizer@siemens.com> +---- +diff --git a/code/cst/code/build/make/rules.mk b/code/cst/code/build/make/rules.mk +index 1c0842b..9c46cc4 100644 +--- a/code/cst/code/build/make/rules.mk ++++ b/code/cst/code/build/make/rules.mk +@@ -25,11 +25,11 @@ LFLAGS := -t + %.a: + @echo "Create archive $@" + $(AR) $(ARFLAGS) $@ $^ +-ifneq ($(OSTYPE),mingw32) +-ifneq ($(OSTYPE),osx) +- $(OBJCOPY) --weaken $@ +-endif +-endif ++#ifneq ($(OSTYPE),mingw32) ++#ifneq ($(OSTYPE),osx) ++# $(OBJCOPY) --weaken $@ ++#endif ++#endif + + %.exe: + @echo "Link $@" +diff --git a/code/cst/code/front_end/src/acst.c b/code/cst/code/front_end/src/acst.c +index fb1e8aa..1e993ee 100644 +--- a/code/cst/code/front_end/src/acst.c ++++ b/code/cst/code/front_end/src/acst.c +@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /*=========================================================================== + LOCAL VARIABLES + =============================================================================*/ +-char err_msg[MAX_ERR_MSG_BYTES]; ++static char err_msg[MAX_ERR_MSG_BYTES]; + + /*=========================================================================== + LOCAL FUNCTION PROTOTYPES +diff --git a/code/cst/code/front_end/src/misc_helper.c b/code/cst/code/front_end/src/misc_helper.c +index 678dc17..9014b2a 100644 +--- a/code/cst/code/front_end/src/misc_helper.c ++++ b/code/cst/code/front_end/src/misc_helper.c +@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /*=========================================================================== + LOCAL VARIABLES + =============================================================================*/ +-char err_msg[MAX_ERR_MSG_BYTES]; ++static char err_msg[MAX_ERR_MSG_BYTES]; + + /*=========================================================================== + LOCAL FUNCTION PROTOTYPES diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb new file mode 100644 index 00000000..5f808a97 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-devtools/cst/imx-cst_3.3.1.bb @@ -0,0 +1,35 @@ +SUMMARY = "i.MX code signing tool" +DESCRIPTION = "Provides software code signing support designed that integrate the HABv4 and AHAB library" +SECTION = "cst" +LICENSE = "BSD-3-Clause" + +LIC_FILES_CHKSUM = "file://LICENSE.bsd3;md5=1fbcd66ae51447aa94da10cbf6271530" + +DEPENDS = "byacc-native flex-native openssl" + +# tag=debian/3.3.1+dfsg-2 +SRCREV = "e2c687a856e6670e753147aacef42d0a3c07891a" +SRC_URI = " \ + file://0001-fix-err-msg-linking.patch \ + git://gitlab.apertis.org/pkg/imx-code-signing-tool.git;protocol=https;branch=apertis/v2022pre \ +" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"' + +do_compile() { + cd ${S}/code/cst + oe_runmake build OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}" + cd - + oe_runmake -C code/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" +} + +do_install () { + install -d ${D}${bindir} + install -m 755 ${S}/code/cst/code/obj.linux64/cst ${D}${bindir} + install -m 755 ${S}/code/cst/code/obj.linux64/srktool ${D}${bindir} + install -m 755 ${S}/code/hab_csf_parser/csf_parser ${D}${bindir} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend index 8c6138c5..d07f8ae1 100644 --- a/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_qoriq-ppc = " file://ppc-fixplt.patch " +SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch " diff --git a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb index 2f5f1afa..62a71772 100644 --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb @@ -1,33 +1,33 @@ SUMMARY = "Frame Manager Configuration tool" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=a504ab5a8ff235e67c7301214749346c" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a504ab5a8ff235e67c7301214749346c" PR = "r2" DEPENDS = "libxml2 fmlib tclap" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/fmc;nobranch=1" -SRCREV = "c7576ab7fb6fb09b68ebc40531e5452fc89e5cd5" +SRC_URI = "git://github.com/nxp-qoriq/fmc;protocol=https;nobranch=1" +SRCREV = "63c8ac99899a9bcd723801579b4d786594670455" S = "${WORKDIR}/git" EXTRA_OEMAKE = 'FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \ TCLAP_HEADER_PATH="${STAGING_INCDIR}" ' -EXTRA_OEMAKE_virtclass-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ +EXTRA_OEMAKE:class-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING_INCDIR}/fmd" \ FMD_USPACE_LIB_PATH="${STAGING_LIBDIR}" LIBXML2_HEADER_PATH="${STAGING_INCDIR}/libxml2" \ TCLAP_HEADER_PATH="${STAGING_INCDIR}" ' EXTRA_OEMAKE_PLATFORM ?= "" -EXTRA_OEMAKE_PLATFORM_ls1043a = "ls1043" -EXTRA_OEMAKE_PLATFORM_ls1046a = "ls1046" -EXTRA_OEMAKE_PLATFORM_ls1088a = "ls1088" -EXTRA_OEMAKE_PLATFORM_p1020 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p2020 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p2041 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p3041 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p4080 = "p4080ds" -EXTRA_OEMAKE_PLATFORM_p5040 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:ls1043a = "ls1043" +EXTRA_OEMAKE_PLATFORM:ls1046a = "ls1046" +EXTRA_OEMAKE_PLATFORM:ls1088a = "ls1088" +EXTRA_OEMAKE_PLATFORM:p1020 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p2020 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p2041 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p3041 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p4080 = "p4080ds" +EXTRA_OEMAKE_PLATFORM:p5040 = "p4080ds" do_compile () { diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch index 283a081b..283a081b 100644 --- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx/0016-xserver-common-enable-iglx-module.patch +++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common/imx-nxp-bsp/0016-xserver-common-enable-iglx-module.patch diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend index f4f43504..be694574 100644 --- a/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend +++ b/dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend @@ -1,8 +1,8 @@ # i.MX extra configuration -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu3d = " \ +SRC_URI:append:imxgpu3d = " \ file://0016-xserver-common-enable-iglx-module.patch \ " -PACKAGE_ARCH_imxgpu3d = "${MACHINE_SOCARCH}" +PACKAGE_ARCH:imxgpu3d = "${MACHINE_SOCARCH}" diff --git a/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend b/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend new file mode 100644 index 00000000..5cf6d411 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-multimedia/mpv/mpv_%.bbappend @@ -0,0 +1,2 @@ +# testbuild/../test.c:10: undefined reference to `glXCreateContext' +PACKAGECONFIG:remove:imxgpu = "x11" diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc index 187681a8..1f63cd7a 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:" +FILESEXTRAPATHS:prepend := "${THISDIR}/qt4:" python __anonymous () { families = ['mx6'] @@ -8,21 +8,23 @@ python __anonymous () { d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir') } -SRC_URI_append_imxgpu2d += " \ +SRC_URI:append:imxgpu2d = " \ file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \ file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \ file://0003-i.MX6-force-egl-visual-ID-33.patch \ + file://0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch \ + file://0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch \ " -DEPENDS_append_imxgpu2d = " virtual/kernel virtual/libgles2" -QT_GLFLAGS_imxgpu2d = "-opengl es2 -openvg" -QT_CONFIG_FLAGS_append_imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \ +DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2" +QT_GLFLAGS:imxgpu2d = "-opengl es2 -openvg" +QT_CONFIG_FLAGS:append:imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \ -I${STAGING_KERNEL_DIR}/include/ \ -DLINUX=1 -DEGL_API_FB=1 \ -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1" # The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx -do_compile_append_mx6 () { +do_compile:append:mx6-nxp-bsp () { find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g' } diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch new file mode 100644 index 00000000..7eee7cf2 --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0001-config.tests-add-DEFINES-to-compile-egl-test-with-im.patch @@ -0,0 +1,25 @@ +From 234580de9d63fd79a8b444358cdaeac111a17061 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:06:04 +0200 +Subject: [PATCH 1/2] config.tests: add DEFINES to compile egl test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl/egl.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl/egl.pro b/config.tests/unix/egl/egl.pro +index f04d0535..bc35b908 100644 +--- a/config.tests/unix/egl/egl.pro ++++ b/config.tests/unix/egl/egl.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch new file mode 100644 index 00000000..993df85e --- /dev/null +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/0002-config.tests-add-DEFINES-to-compile-egl4gles1-test-w.patch @@ -0,0 +1,25 @@ +From adb19c68d3c92eb1a88e49e447ce827f14943486 Mon Sep 17 00:00:00 2001 +From: Mauro Salvini <m.salvini@koansoftware.com> +Date: Thu, 29 Sep 2022 16:12:11 +0200 +Subject: [PATCH 2/2] config.tests: add DEFINES to compile egl4gles1 test with + imxgpu2d (Vivante) + +Signed-off-by: Mauro Salvini <m.salvini@koansoftware.com> +--- + config.tests/unix/egl4gles1/egl4gles1.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/config.tests/unix/egl4gles1/egl4gles1.pro b/config.tests/unix/egl4gles1/egl4gles1.pro +index 667ea8e3..14cb4a76 100644 +--- a/config.tests/unix/egl4gles1/egl4gles1.pro ++++ b/config.tests/unix/egl4gles1/egl4gles1.pro +@@ -6,5 +6,6 @@ for(p, QMAKE_LIBDIR_EGL) { + + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL ++DEFINES += LINUX=1 EGL_API_FB=1 + + CONFIG -= qt +-- +2.17.1 + diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/g++.conf b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/g++.conf index 915ecba0..915ecba0 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/g++.conf +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/g++.conf diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/linux.conf b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/linux.conf index c644d8ba..c644d8ba 100644 --- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6/linux.conf +++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4/mx6-nxp-bsp/linux.conf diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch index 7e625fd1..2a345f4c 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch @@ -6,7 +6,7 @@ Subject: [PATCH] egl.prf: Fix build error when egl headers need platform Gain the value through pkg-config and pass it through QMAKE_CFLAGS_EGL. -Upstream-Status: Pending +Upstream-Status: Pending [https://bugreports.qt.io/browse/QTBUG-61712] Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> --- diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index bf3fb66e..7401a566 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -3,35 +3,35 @@ # Copyright (C) 2016, 2017 O.S. Systems Software LTDA. # Copyright (C) 2017-2018 NXP -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu = " \ +SRC_URI:append:imxgpu = " \ file://0014-Add-IMX-GPU-support.patch \ file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \ " PACKAGECONFIG_GL_IMX_GPU = "" -PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms" +PACKAGECONFIG_GL_IMX_GPU:mx8-nxp-bsp = "gbm kms" -PACKAGECONFIG_GL_imxpxp = "gles2" -PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ +PACKAGECONFIG_GL:imxpxp = "gles2" +PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ ${PACKAGECONFIG_GL_IMX_GPU}" -PACKAGECONFIG_GL_imxgpu3d = "gles2 \ +PACKAGECONFIG_GL:imxgpu3d = "gles2 \ ${PACKAGECONFIG_GL_IMX_GPU}" -PACKAGECONFIG_GL_use-mainline-bsp ?= "gles2 gbm kms" +PACKAGECONFIG_GL:use-mainline-bsp ?= "gles2 gbm kms" PACKAGECONFIG_PLATFORM = "" -PACKAGECONFIG_PLATFORM_imxgpu2d = "no-opengl linuxfb" -PACKAGECONFIG_PLATFORM_imxgpu3d = " \ +PACKAGECONFIG_PLATFORM:imxgpu2d = "no-opengl linuxfb" +PACKAGECONFIG_PLATFORM:imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ 'eglfs', d), d)}" -PACKAGECONFIG_PLATFORM_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" +PACKAGECONFIG_PLATFORM:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}" PACKAGECONFIG_VULKAN_IMX_GPU = "" -PACKAGECONFIG_VULKAN_IMX_GPU_mx8 = "vulkan" -PACKAGECONFIG_VULKAN_IMX_GPU_mx8mm = "" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" PACKAGECONFIG_VULKAN = "" -PACKAGECONFIG_VULKAN_imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" +PACKAGECONFIG_VULKAN:imxgpu = "${PACKAGECONFIG_VULKAN_IMX_GPU}" PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend new file mode 100644 index 00000000..f019c72d --- /dev/null +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtmultimedia_%.bbappend @@ -0,0 +1,9 @@ +# Fixes QT5 application builds searching for libimx6vivantevideonode.so +# via cmake cmake/Qt5Multimedia/Qt5MultimediaConfig.cmake +do_install:append:imxgpu() { + install -d ${D}${libdir}/plugins/videoimx6vivantevideonode + ln -sf ../video/videonode/libeglvideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libeglvideonode.so + ln -sf ../video/videonode/libimx6vivantevideonode.so ${D}${libdir}/plugins/videoimx6vivantevideonode/libimx6vivantevideonode.so +} + +INSANE_SKIP:${PN}-plugins:imxgpu = "dev-so" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend index afc728c1..a97b765f 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend @@ -1,5 +1,8 @@ # etnaviv mesa does not have glx -PACKAGECONFIG_remove_use-mainline-bsp = "xcomposite-glx" +PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" + +PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" # i.MX8 does never provide native x11, so required dependencies are not met -PACKAGECONFIG_remove_mx8 = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend new file mode 100644 index 00000000..1c51fc09 --- /dev/null +++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend @@ -0,0 +1,54 @@ +# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique +# Copyright (C) 2016 Freescale Semiconductor +# Copyright (C) 2016, 2017 O.S. Systems Software LTDA. +# Copyright (C) 2017-2018 NXP + +PACKAGECONFIG_GRAPHICS:imxpxp = " \ + gles2" +PACKAGECONFIG_GRAPHICS:imxgpu2d = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \ + ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" +PACKAGECONFIG_GRAPHICS:imxgpu3d = " \ + gles2 \ + ${PACKAGECONFIG_GRAPHICS_IMX_GPU}" +PACKAGECONFIG_GRAPHICS_IMX_GPU = "" +PACKAGECONFIG_GRAPHICS_IMX_GPU:mx8-nxp-bsp = " \ + gbm kms" + +PACKAGECONFIG_GRAPHICS:use-mainline-bsp ?= " \ + gles2 gbm kms" + +PACKAGECONFIG += " \ + ${PACKAGECONFIG_PLATFORM}" + +PACKAGECONFIG_PLATFORM = "" +PACKAGECONFIG_PLATFORM:imxgpu2d = " \ + no-opengl \ + linuxfb \ + ${PACKAGECONFIG_PLATFORM_EGLFS}" +PACKAGECONFIG_PLATFORM:imxgpu3d = " \ + ${PACKAGECONFIG_PLATFORM_EGLFS}" + +PACKAGECONFIG_PLATFORM_EGLFS = "" +PACKAGECONFIG_PLATFORM_EGLFS:imxgpu3d = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ + bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ + 'eglfs', d), d)}" +PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = " \ + eglfs" + +PACKAGECONFIG_PLATFORM:use-mainline-bsp = " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}" + +PACKAGECONFIG += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${PACKAGECONFIG_WAYLAND}', '', d)}" +PACKAGECONFIG_WAYLAND = "wayland" + +PACKAGECONFIG += " \ + ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}" +PACKAGECONFIG_VULKAN = "" +PACKAGECONFIG_VULKAN:imxgpu = " \ + ${PACKAGECONFIG_VULKAN_IMX_GPU}" +PACKAGECONFIG_VULKAN_IMX_GPU = "" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8-nxp-bsp = "vulkan" +PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm-nxp-bsp = "" diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend new file mode 100644 index 00000000..ca011758 --- /dev/null +++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtwayland_%.bbappend @@ -0,0 +1,6 @@ +# etnaviv mesa does not have glx +PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx" + +PACKAGECONFIG:remove:mx6-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx7-nxp-bsp = "xcomposite-egl xcomposite-glx" +PACKAGECONFIG:remove:mx8-nxp-bsp = "xcomposite-egl xcomposite-glx" diff --git a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend index c7e6d32e..f64637bd 100644 --- a/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend +++ b/dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend @@ -1,9 +1,9 @@ -PACKAGECONFIG_qoriq-ppc = "qemu yajl lxc test remote macvtap libvirtd netcf udev python" +PACKAGECONFIG:qoriq-ppc = "qemu yajl lxc test remote macvtap libvirtd netcf udev python" -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -SRC_URI_append_qoriq-ppc = " file://qemu.conf" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" +SRC_URI:append:qoriq-ppc = " file://qemu.conf" -do_install_append_qoriq-ppc() { +do_install:append:qoriq-ppc() { install -m 0644 ${WORKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf } |