diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-02-10 16:09:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 16:09:50 +0100 |
| commit | 1b433912a8e05a99920ee6d9875865d75911a4f2 (patch) | |
| tree | 96f4eda5bee4d7a09b8f8c60caaae2484d9ea738 | |
| parent | 6b9eabed95640ee9511f14c31a994049ca8a7477 (diff) | |
| parent | 9beb16e281aac41199b5428e25071d510bfa6ac4 (diff) | |
| download | meta-updater-1b433912a8e05a99920ee6d9875865d75911a4f2.tar.gz | |
Merge pull request #680 from advancedtelematic/fix/thud/agl-build-connman
connman: Only apply our patch to 1.35.
| -rw-r--r-- | recipes-connectivity/connman/connman_%.bbappend | 5 | ||||
| -rw-r--r-- | recipes-connectivity/connman/connman_1.35.bbappend | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index 08ec832..b3633cc 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend | |||
| @@ -1,6 +1 @@ | |||
| 1 | RPROVIDES_${PN} += "virtual/network-configuration" | RPROVIDES_${PN} += "virtual/network-configuration" | |
| 2 | |||
| 3 | # patch to not create the resolv.conf symlink at run-time, as it's already | ||
| 4 | # handled in the recipe and messes up with ostree | ||
| 5 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
| 6 | SRC_URI += "file://0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch" | ||
diff --git a/recipes-connectivity/connman/connman_1.35.bbappend b/recipes-connectivity/connman/connman_1.35.bbappend new file mode 100644 index 0000000..08ec832 --- /dev/null +++ b/recipes-connectivity/connman/connman_1.35.bbappend | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | RPROVIDES_${PN} += "virtual/network-configuration" | ||
| 2 | |||
| 3 | # patch to not create the resolv.conf symlink at run-time, as it's already | ||
| 4 | # handled in the recipe and messes up with ostree | ||
| 5 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
| 6 | SRC_URI += "file://0001-tmpfiles-script-do-not-create-the-resolv.conf-symlin.patch" | ||