diff --git a/examples/emcute/Makefile b/examples/emcute/Makefile index 23894cbbea6af610671b4d0c80b91166bca56e9d..89a7e1b2c16cbfb05337093aca7de1036a69acd1 100644 --- a/examples/emcute/Makefile +++ b/examples/emcute/Makefile @@ -1,5 +1,5 @@ # name of your application -APPLICATION = emcute +APPLICATION = emcute_example # If no BOARD is found in the environment, use this default: BOARD ?= native diff --git a/examples/gcoap/Makefile b/examples/gcoap/Makefile index 00f31ba4adb41e0858dc0d2bb311fd636dc12ba3..3b67ab9f8c3749fd9a114ec30eb5e23049dc7a17 100644 --- a/examples/gcoap/Makefile +++ b/examples/gcoap/Makefile @@ -1,7 +1,7 @@ # Default Makefile, for host native GNRC-based networking # name of your application -APPLICATION = gcoap +APPLICATION = gcoap_example # If no BOARD is found in the environment, use this default: BOARD ?= native diff --git a/examples/gnrc_tftp/Makefile b/examples/gnrc_tftp/Makefile index 98e013fa2491df3ad903d666721a219eea3ee948..d6e18431e0819a548061b17cc1453ea812b8f894 100644 --- a/examples/gnrc_tftp/Makefile +++ b/examples/gnrc_tftp/Makefile @@ -1,5 +1,5 @@ # name of your application -APPLICATION = gnrc_tftp +APPLICATION = gnrc_tftp_example # If no BOARD is found in the environment, use this default: BOARD ?= native diff --git a/examples/posix_sockets/Makefile b/examples/posix_sockets/Makefile index c8ce99613e2f0eb2e7fd62948eb0bdbf664d5a96..b3e328402473c6d5ed3e26df288b78406c175ac9 100644 --- a/examples/posix_sockets/Makefile +++ b/examples/posix_sockets/Makefile @@ -1,5 +1,5 @@ # name of your application -APPLICATION = posix_sockets +APPLICATION = posix_sockets_example # If no BOARD is found in the environment, use this default: BOARD ?= native diff --git a/examples/saul/Makefile b/examples/saul/Makefile index be2b858d8194aaf8891b06d0670a48132daeeea3..38c83c5baac8973d793e494cbf8f42098f7b2d86 100644 --- a/examples/saul/Makefile +++ b/examples/saul/Makefile @@ -1,5 +1,5 @@ # name of your application -APPLICATION = saul +APPLICATION = saul_example # If no BOARD is found in the environment, use this default: BOARD ?= native diff --git a/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch b/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch index 7075acd4a55f2a60b42faceb5227dad6a601a190..10462a23c6753adaf42c1bafc847ac55c9aba2a0 100644 Binary files a/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch and b/pkg/libfixmath/patches/0001-Move-to-RIOT-Makefiles.patch differ diff --git a/pkg/libfixmath/patches/0002-Fix-warnings.patch b/pkg/libfixmath/patches/0002-Fix-warnings.patch index b2f028273fa5b22c4b6fdf6015c5ebd1aa06c3a0..2de4009e10d8000b0b0aa60a485bc6607977ff5c 100644 Binary files a/pkg/libfixmath/patches/0002-Fix-warnings.patch and b/pkg/libfixmath/patches/0002-Fix-warnings.patch differ diff --git a/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch b/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch index 329a8466aa1a4b12bcdfe1f02da5672ae67757fd..881f4456ea2ca4ec5651ee8c28a183aa38bf1275 100644 Binary files a/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch and b/pkg/libfixmath/patches/0003-Adapt-unittests-for-RIOT.patch differ diff --git a/pkg/libfixmath/patches/0004-Change-conflicting-module-name-for-pkg-root-director.patch b/pkg/libfixmath/patches/0004-Change-conflicting-module-name-for-pkg-root-director.patch new file mode 100644 index 0000000000000000000000000000000000000000..67aed3aa8ab89f8c18a815311c419d010bd394ae Binary files /dev/null and b/pkg/libfixmath/patches/0004-Change-conflicting-module-name-for-pkg-root-director.patch differ diff --git a/pkg/u8g2/patches/0001-u8g2-add-RIOT-makefiles.patch b/pkg/u8g2/patches/0001-u8g2-add-RIOT-makefiles.patch index dc342cbd68fdc3cacb82f02ac81ba8a77488a8b3..6f81d3c212513499de80c6d232930b7cfc01db63 100644 Binary files a/pkg/u8g2/patches/0001-u8g2-add-RIOT-makefiles.patch and b/pkg/u8g2/patches/0001-u8g2-add-RIOT-makefiles.patch differ diff --git a/pkg/u8g2/patches/0002-add-RIOT-interface.patch b/pkg/u8g2/patches/0002-add-RIOT-interface.patch index 0004a3a495c832666055f995f38d7a65e49cd58b..dcca03af4ce2d5818e26c9237222876be066aa78 100644 Binary files a/pkg/u8g2/patches/0002-add-RIOT-interface.patch and b/pkg/u8g2/patches/0002-add-RIOT-interface.patch differ diff --git a/pkg/u8g2/patches/0003-Change-conflicting-module-name-for-pkg-root-director.patch b/pkg/u8g2/patches/0003-Change-conflicting-module-name-for-pkg-root-director.patch new file mode 100644 index 0000000000000000000000000000000000000000..29af20dbaba93cb361d2348847dae201be7b1d46 Binary files /dev/null and b/pkg/u8g2/patches/0003-Change-conflicting-module-name-for-pkg-root-director.patch differ