Merge branch 'rust-embedded:master' into enable_network_in_compile_task

banditopazzo · web-flow · commit b2838a0acd52 · 2024-10-03T21:26:25.000Z
diff --git a/build-new-version.sh b/build-new-version.sh
@@ -35,6 +35,7 @@ TARGET_TRIPLES=(
     powerpc-unknown-linux-gnu
     x86_64-unknown-linux-gnu
     riscv64gc-unknown-linux-gnu
+    thumbv7neon-unknown-linux-gnueabihf
 )
 
 RUSTC_TRIPLES=(
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -19,4 +19,5 @@ LAYERSERIES_COMPAT_rust-bin-layer = " \
     langdale \
     mickledore \
     nanbield \
+    scarthgap \
 "
diff --git a/recipes-devtools/rust/cargo-bin-cross_1.79.0.bb b/recipes-devtools/rust/cargo-bin-cross_1.79.0.bb
@@ -0,0 +1,51 @@
+
+# Recipe for cargo 20240613
+# This corresponds to rust release 1.79.0
+
+def get_by_triple(hashes, triple):
+    try:
+        return hashes[triple]
+    except:
+        raise bb.parse.SkipRecipe("Unsupported triple: %s" % triple)
+
+def cargo_md5(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "4fca6d303a8f78cf2fa5ac28ab3575a9",
+        "arm-unknown-linux-gnueabi": "64ac3988c88ddeec8d8947615ccdccef",
+        "arm-unknown-linux-gnueabihf": "631a29a37067cd309e955a396c5efc65",
+        "armv7-unknown-linux-gnueabihf": "904c3115985b30bde8356c134185211f",
+        "i686-unknown-linux-gnu": "08606705b7b64dde50f44df0ff46c7ab",
+        "x86_64-unknown-linux-gnu": "4a89780dc045b3fe221b4507ed63bfd3",
+    }
+    return get_by_triple(HASHES, triple)
+
+def cargo_sha256(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "225c07709630c3806ebb3f42995f47c78007cb42c088173ea24ea672a39265b7",
+        "arm-unknown-linux-gnueabi": "fc6ac6983ba8980e3786a4b869c158194628b1602e7e7124351c0174e74d01c0",
+        "arm-unknown-linux-gnueabihf": "12fd0996300ec60b69eae4dbf69c4d859252806d3662eeaf84c6c6aa4369376c",
+        "armv7-unknown-linux-gnueabihf": "ad3378a37728401216130801e9e32c187ba91fda0385d99c5256b0c7f7485cb8",
+        "i686-unknown-linux-gnu": "d6afdacd1c3022cdaa9dfb1cdfa5bb11a824459575aa27be5ba2f8c199789ff5",
+        "x86_64-unknown-linux-gnu": "d394298cfd4a51eaf85607cceb33a1d83cbe723365687d7055f4b68e065a72fe",
+    }
+    return get_by_triple(HASHES, triple)
+
+def cargo_url(triple):
+    URLS = {
+        "aarch64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-06-13/cargo-1.79.0-aarch64-unknown-linux-gnu.tar.gz",
+        "arm-unknown-linux-gnueabi": "https://static.rust-lang.org/dist/2024-06-13/cargo-1.79.0-arm-unknown-linux-gnueabi.tar.gz",
+        "arm-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2024-06-13/cargo-1.79.0-arm-unknown-linux-gnueabihf.tar.gz",
+        "armv7-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2024-06-13/cargo-1.79.0-armv7-unknown-linux-gnueabihf.tar.gz",
+        "i686-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-06-13/cargo-1.79.0-i686-unknown-linux-gnu.tar.gz",
+        "x86_64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-06-13/cargo-1.79.0-x86_64-unknown-linux-gnu.tar.gz",
+    }
+    return get_by_triple(URLS, triple)
+
+DEPENDS += "rust-bin-cross-${TARGET_ARCH} (= 1.79.0)"
+
+LIC_FILES_CHKSUM = "\
+    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
+    file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+"
+
+require cargo-bin-cross.inc
diff --git a/recipes-devtools/rust/cargo-bin-cross_1.80.0.bb b/recipes-devtools/rust/cargo-bin-cross_1.80.0.bb
@@ -0,0 +1,51 @@
+
+# Recipe for cargo 20240725
+# This corresponds to rust release 1.80.0
+
+def get_by_triple(hashes, triple):
+    try:
+        return hashes[triple]
+    except:
+        raise bb.parse.SkipRecipe("Unsupported triple: %s" % triple)
+
+def cargo_md5(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "58dc218af2e33efe17aca4d7ae3f062c",
+        "arm-unknown-linux-gnueabi": "c9e2c9fc8568164f7967c264c6f16683",
+        "arm-unknown-linux-gnueabihf": "744670e53d058f35b88fb5a1f9c7f129",
+        "armv7-unknown-linux-gnueabihf": "774bc0ebc9759ffae6c400d729b378a6",
+        "i686-unknown-linux-gnu": "93948493dc8412b76cfb96d962654821",
+        "x86_64-unknown-linux-gnu": "fc7758d04a7f779fdc8cb073f93bfcf3",
+    }
+    return get_by_triple(HASHES, triple)
+
+def cargo_sha256(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "7612e02605822de66dfff3e91f010cf965de1075e9749aa4ab697de80f8493e2",
+        "arm-unknown-linux-gnueabi": "f796a2edf107f3772e39ec6619b4b618f115967ba786df6d9cb22e663126c289",
+        "arm-unknown-linux-gnueabihf": "6e3281c8c94f2ab7087edc636d595d9cb0f3314ba246c7e22300b73f7792dc84",
+        "armv7-unknown-linux-gnueabihf": "491fa770027f2d79befb9f15f9f663a484f19fb99d1fd41eef19e5f1c0c21b24",
+        "i686-unknown-linux-gnu": "f773713d8c57f6da59f630fb7b81cdbcf5dd440016849e5841669908dc868856",
+        "x86_64-unknown-linux-gnu": "df8aa17a99b7993d315b2046d404996619295ef74b12a411406a4c84de06fcdc",
+    }
+    return get_by_triple(HASHES, triple)
+
+def cargo_url(triple):
+    URLS = {
+        "aarch64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-07-25/cargo-1.80.0-aarch64-unknown-linux-gnu.tar.gz",
+        "arm-unknown-linux-gnueabi": "https://static.rust-lang.org/dist/2024-07-25/cargo-1.80.0-arm-unknown-linux-gnueabi.tar.gz",
+        "arm-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2024-07-25/cargo-1.80.0-arm-unknown-linux-gnueabihf.tar.gz",
+        "armv7-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2024-07-25/cargo-1.80.0-armv7-unknown-linux-gnueabihf.tar.gz",
+        "i686-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-07-25/cargo-1.80.0-i686-unknown-linux-gnu.tar.gz",
+        "x86_64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-07-25/cargo-1.80.0-x86_64-unknown-linux-gnu.tar.gz",
+    }
+    return get_by_triple(URLS, triple)
+
+DEPENDS += "rust-bin-cross-${TARGET_ARCH} (= 1.80.0)"
+
+LIC_FILES_CHKSUM = "\
+    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
+    file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+"
+
+require cargo-bin-cross.inc
diff --git a/recipes-devtools/rust/cargo-bin-cross_1.81.0.bb b/recipes-devtools/rust/cargo-bin-cross_1.81.0.bb
@@ -0,0 +1,51 @@
+
+# Recipe for cargo 20240905
+# This corresponds to rust release 1.81.0
+
+def get_by_triple(hashes, triple):
+    try:
+        return hashes[triple]
+    except:
+        raise bb.parse.SkipRecipe("Unsupported triple: %s" % triple)
+
+def cargo_md5(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "df294b72dd4edb3eea1d29aac9261c98",
+        "arm-unknown-linux-gnueabi": "758de33d916c519160a9f6022f77f33f",
+        "arm-unknown-linux-gnueabihf": "df65283b525d451c72c03af0bc22e039",
+        "armv7-unknown-linux-gnueabihf": "72b5ccad7512af6c6d42ac49c8fe4d8e",
+        "i686-unknown-linux-gnu": "33dc88f5d29398d9a45cf8562d4de5db",
+        "x86_64-unknown-linux-gnu": "bc5fec57cfdf6b2aa8599622d9e830e7",
+    }
+    return get_by_triple(HASHES, triple)
+
+def cargo_sha256(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "00c5185b49a885df529832327d2584a9c26dd03df64f0a52b32a3f34bf3498c1",
+        "arm-unknown-linux-gnueabi": "720b7ee96a9adc7ade3b75ebcac68d5eb815d3342b2afd8fab6079970cf28158",
+        "arm-unknown-linux-gnueabihf": "94778c04f530cf3fa278343a8a6d5212a91687a0f716f7b51e088dcde62ad662",
+        "armv7-unknown-linux-gnueabihf": "c35378a2ce56867a0067bd7d36b60e80976bddb9674f152eacb918f0cbdb3909",
+        "i686-unknown-linux-gnu": "146539c6e3120a8d528ff4baa3825ad7bb62c66c25be41494b45bf53860cfaf8",
+        "x86_64-unknown-linux-gnu": "e735432b85349aa78ed164ff03a31c43298f46a085fef047a33607adee80adc3",
+    }
+    return get_by_triple(HASHES, triple)
+
+def cargo_url(triple):
+    URLS = {
+        "aarch64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-aarch64-unknown-linux-gnu.tar.gz",
+        "arm-unknown-linux-gnueabi": "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-arm-unknown-linux-gnueabi.tar.gz",
+        "arm-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-arm-unknown-linux-gnueabihf.tar.gz",
+        "armv7-unknown-linux-gnueabihf": "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-armv7-unknown-linux-gnueabihf.tar.gz",
+        "i686-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-i686-unknown-linux-gnu.tar.gz",
+        "x86_64-unknown-linux-gnu": "https://static.rust-lang.org/dist/2024-09-05/cargo-1.81.0-x86_64-unknown-linux-gnu.tar.gz",
+    }
+    return get_by_triple(URLS, triple)
+
+DEPENDS += "rust-bin-cross-${TARGET_ARCH} (= 1.81.0)"
+
+LIC_FILES_CHKSUM = "\
+    file://LICENSE-APACHE;md5=71b224ca933f0676e26d5c2e2271331c \
+    file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+"
+
+require cargo-bin-cross.inc
diff --git a/recipes-devtools/rust/rust-bin-cross_1.79.0.bb b/recipes-devtools/rust/rust-bin-cross_1.79.0.bb
@@ -0,0 +1,67 @@
+
+def get_by_triple(hashes, triple):
+    try:
+        return hashes[triple]
+    except:
+        raise bb.parse.SkipRecipe("Unsupported triple: %s" % triple)
+
+
+def rust_std_md5(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "1a2f2c65e479417cdd3701b405a8ba12",
+        "aarch64-unknown-linux-musl": "94efb02333dbba1946a92efd37c53e2b",
+        "arm-unknown-linux-gnueabi": "228d4cef5702e6a66e942fcd22649c76",
+        "arm-unknown-linux-gnueabihf": "6445ea305bdd060973c69a5c5fe3dddb",
+        "armv5te-unknown-linux-gnueabi": "4c7d6fa1c6553d8a9e332193760dbe79",
+        "armv5te-unknown-linux-musleabi": "29a57843d360c06807a7c6ca457ace9b",
+        "armv7-unknown-linux-gnueabihf": "1fa9d5b5098027422417bb40398c88d6",
+        "armv7-unknown-linux-musleabihf": "2f22363122f8ef320f1bea8b8714cbb4",
+        "i686-unknown-linux-gnu": "c8f5ad57f671439da143895e2203d3ed",
+        "powerpc-unknown-linux-gnu": "a180a1e4357e5d9b4dd674204ef377c2",
+        "x86_64-unknown-linux-gnu": "489611626b01cf4f882df76e3cfe7306",
+        "riscv64gc-unknown-linux-gnu": "9c207fd91907f498ae81c5bf23c48c69",
+    }
+    return get_by_triple(HASHES, triple)
+
+def rust_std_sha256(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "e4597274ffbad0b3196dbab9f8badbdf33d4407a07e3f577c074cc90f95c0ca5",
+        "aarch64-unknown-linux-musl": "8c65e465f3f82ae55fc2f43ac58de7d972497bc839829e0119784be98faa8431",
+        "arm-unknown-linux-gnueabi": "c2176c83c3678662ba9df439b4159e031829471a575680fab5f0f0c4530de322",
+        "arm-unknown-linux-gnueabihf": "78b12ddf1a08652654069a94ce435c6c933047d6a4dd679a973a85dfb4e53747",
+        "armv5te-unknown-linux-gnueabi": "e6c038d813cb13e00e83e84c71b6ac5f456fb375b2ac40eae28539dc71951bac",
+        "armv5te-unknown-linux-musleabi": "abcc6889da2ecf5f241683938e204b9b2e9dd972c43e4e6db58a50a19243f188",
+        "armv7-unknown-linux-gnueabihf": "2d1d15bae7122bae44a5636512594332851b74c6a9a7ad39ad5d07ffad4f74a8",
+        "armv7-unknown-linux-musleabihf": "d810d962137f3392ce3509ba8aedf03023282fbfa890ade2df5f4df1230dbb51",
+        "i686-unknown-linux-gnu": "325728d4e7c941467171a51e5d2ad10c18e69c09c5495dc8f3e104ff0ed67de5",
+        "powerpc-unknown-linux-gnu": "0ba4060db997a1b6bb2a06364a9e20d6c68b22c16d5e862a3673d2f447f19b80",
+        "x86_64-unknown-linux-gnu": "037906a372ec87f8fd7ab45efa645bcc4fbf981f534e31534c6f16ce628fddb6",
+        "riscv64gc-unknown-linux-gnu": "8578f69dff411c9afd0b1a993ac35641b9741dd901fcd680eac2789287f6c551",
+    }
+    return get_by_triple(HASHES, triple)
+
+def rustc_md5(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "b81cd7affda20a7fc92de69d53e23f28",
+        "arm-unknown-linux-gnueabi": "05e03537ec1bdc5c12d23e68584c06ff",
+        "arm-unknown-linux-gnueabihf": "c6bbd549df90142ef97f10fc739886da",
+        "armv7-unknown-linux-gnueabihf": "0301b40b375c0680b2c8e04ae48a49ae",
+        "i686-unknown-linux-gnu": "e1059f0fbc553a8f3252f72f9123f81d",
+        "x86_64-unknown-linux-gnu": "a0cac6f2de82fbf573c7706a766466e6",
+    }
+    return get_by_triple(HASHES, triple)
+
+def rustc_sha256(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "d091d87ccded2221ce0ae4aaf7b3b254674fd29dd72f3d4137033c07faf575bf",
+        "arm-unknown-linux-gnueabi": "cc157f6ecd1e32eb20056b230e582ee1fa990fab7cd052350442b153a9b2baea",
+        "arm-unknown-linux-gnueabihf": "f40a48b947f7154d22d5eeb46314f22c568d051fb2c6cc1aad655f7ca0aac4a8",
+        "armv7-unknown-linux-gnueabihf": "51f90e98ec60ead65dd0ba90433d3f7d8db5c5d30e6ca7d7dae965c0770d1fa2",
+        "i686-unknown-linux-gnu": "119e21a248e6a81300dcd9c0c3fd78dbac12348a672855e73189009351d5fd59",
+        "x86_64-unknown-linux-gnu": "36e59d225cc4c35f4d63c276c94a5e5cba5c8083275c3990ae7cae6842f9109f",
+    }
+    return get_by_triple(HASHES, triple)
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
+
+require rust-bin-cross.inc
diff --git a/recipes-devtools/rust/rust-bin-cross_1.80.0.bb b/recipes-devtools/rust/rust-bin-cross_1.80.0.bb
@@ -0,0 +1,69 @@
+
+def get_by_triple(hashes, triple):
+    try:
+        return hashes[triple]
+    except:
+        raise bb.parse.SkipRecipe("Unsupported triple: %s" % triple)
+
+
+def rust_std_md5(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "c7bce186e5e9c1e7e5fed9d1a7031b34",
+        "aarch64-unknown-linux-musl": "bc4155694c8f370575ada90c024fba2c",
+        "arm-unknown-linux-gnueabi": "ccd650f6182c4e01937e4a300c2ed9e1",
+        "arm-unknown-linux-gnueabihf": "bcbff1de30d83ad914b9f88de5d297a0",
+        "armv5te-unknown-linux-gnueabi": "b127fa0d883a9d2187ba744b1b4bac9a",
+        "armv5te-unknown-linux-musleabi": "c8b0db1525a20912c1bca1d34786d273",
+        "armv7-unknown-linux-gnueabihf": "1d8030094b264845d27c01ac5b12a72f",
+        "armv7-unknown-linux-musleabihf": "1b1d887d36a43daa043866c75e090a15",
+        "i686-unknown-linux-gnu": "de0c0bda3e2f5f4c74bbc3f72aca54e3",
+        "powerpc-unknown-linux-gnu": "4072cffb22619ceab44c9c3d71a0285a",
+        "x86_64-unknown-linux-gnu": "093653b92d0f131c51d383e7f08d8af9",
+        "riscv64gc-unknown-linux-gnu": "eb089351d7e9f4ea9c9ac8784034ea84",
+        "thumbv7neon-unknown-linux-gnueabihf": "6a3daeb50d4ae7fc832551696ca156f2",
+    }
+    return get_by_triple(HASHES, triple)
+
+def rust_std_sha256(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "6cdbe8c2b502ca90f42c581b8906b725ccc55bbb3427a332379236bf22be59b3",
+        "aarch64-unknown-linux-musl": "7e901aefb3b6576bdca9a6a332c810d463e829d893def7c997754bfbe8494f5d",
+        "arm-unknown-linux-gnueabi": "ab78f4ccc002443de840f22a2fc9357cee2594ca24605c44e264a5606d586dce",
+        "arm-unknown-linux-gnueabihf": "888fdea6202b15ed8c9399089db74aad9cfb0328298e924c5e6161cbc55b25da",
+        "armv5te-unknown-linux-gnueabi": "153b4f1cb1c3055b9f1053b78241ca6ef59302accae35953ca11aa5f6e24a33a",
+        "armv5te-unknown-linux-musleabi": "576f41ab452d92392442a8b842d30a0bb0a79e0d6693bca5c0f3e324262e1886",
+        "armv7-unknown-linux-gnueabihf": "5acec3391a6a67cdee9719c2a03e9059ad3b482872c94f8224a67e1f1f09d1e6",
+        "armv7-unknown-linux-musleabihf": "74b950e2f39d9b4f2a639ce3f356d964d1b6fbc46db1d55a57439103c2c41254",
+        "i686-unknown-linux-gnu": "3d2ff151af3dd0628d85b50614ee24d642079162483d9ebd37e364d02f9b289a",
+        "powerpc-unknown-linux-gnu": "259306814c34c539a3cd0c3b8c6bceee836bbdb0e6918f32b82159029a03d957",
+        "x86_64-unknown-linux-gnu": "ed301dff3a26da496784ca3de523b0150302fcb001ef71cdcd40ff6d5e2ec75d",
+        "riscv64gc-unknown-linux-gnu": "08c016ed824705bfc7367613001dd6d7696e2d314767f96c224e9e8cdf998f6a",
+        "thumbv7neon-unknown-linux-gnueabihf": "446bb691128f3b4d88d63c4688abaf5579846308e1b1fd86510676a58955210c",
+    }
+    return get_by_triple(HASHES, triple)
+
+def rustc_md5(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "87fd8714e3505b75e29191f43595616d",
+        "arm-unknown-linux-gnueabi": "659608424410d5151ec6c5e107fde39e",
+        "arm-unknown-linux-gnueabihf": "c69e45797a23d006b27508359624cbe1",
+        "armv7-unknown-linux-gnueabihf": "e430bc631653916f070dcba40fb93f75",
+        "i686-unknown-linux-gnu": "acb8bf613546cc81aa6e0d2c575fc575",
+        "x86_64-unknown-linux-gnu": "51e03b01a3f2ad97e11796d67e0b5336",
+    }
+    return get_by_triple(HASHES, triple)
+
+def rustc_sha256(triple):
+    HASHES = {
+        "aarch64-unknown-linux-gnu": "49465b52ce0efc35aa7b96e95995011a2bb6a7d4aeb052e204467c1edceb62a1",
+        "arm-unknown-linux-gnueabi": "1fb14d6d8caf22c2d37b500ca8c6aeb170a893a8cb824659f236a63e66e722e6",
+        "arm-unknown-linux-gnueabihf": "e9c5db3f9a231921ef553f1d07bbbb04c3a4ad29c138375fad90dd5768b67553",
+        "armv7-unknown-linux-gnueabihf": "cc15913cd588572ae64599ac5ea73c8cd95e6511002220327ef5d30a5b61c2d7",
+        "i686-unknown-linux-gnu": "58e95ac415363b90fd2158c3439c8a20117f2f3ceb7a2c3e03fdfacaad5aa2f8",
+        "x86_64-unknown-linux-gnu": "383f59272ca8753bbe6c45135f2ea64d59ec4e73a1747d1de2c9345777223204",
+    }
+    return get_by_triple(HASHES, triple)
+
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
+
+require rust-bin-cross.inc
diff --git a/recipes-devtools/rust/rust-bin-cross_1.81.0.bb b/recipes-devtools/rust/rust-bin-cross_1.81.0.bb

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ TARGET_TRIPLES=(`
`35`	`35`	`powerpc-unknown-linux-gnu`
`36`	`36`	`x86_64-unknown-linux-gnu`
`37`	`37`	`riscv64gc-unknown-linux-gnu`
	`38`	`+ thumbv7neon-unknown-linux-gnueabihf`
`38`	`39`	`)`
`39`	`40`
`40`	`41`	`RUSTC_TRIPLES=(`
Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,5 @@ LAYERSERIES_COMPAT_rust-bin-layer = " \`
`19`	`19`	`langdale \`
`20`	`20`	`mickledore \`
`21`	`21`	`nanbield \`
	`22`	`+ scarthgap \`
`22`	`23`	`"`