diff options
| author | Seungjae Yoo <seungjaeyoo@google.com> | 2023-01-12 05:59:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-12 05:59:17 +0000 |
| commit | 1c587eb820cc12a77e711ad41c848f407aae5a63 (patch) | |
| tree | 09fd976b5a3be0797b7ea4565ce8368fa96eadff | |
| parent | 793d3a80680085fd1f81dfce57ea6e8cfb1421b9 (diff) | |
| parent | 37c7e1e8590d604db63fef569a76a88d7e1c217f (diff) | |
| download | openwrt-prebuilts-1c587eb820cc12a77e711ad41c848f407aae5a63.tar.gz | |
Merge "Append INFO file containing emulator and architecture" am: d60b534505 am: 7c97d6429e am: 37c7e1e859
Original change: https://android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/2383712
Change-Id: I33d3c56bfe82f4491f80f2cb8b30bedc513706b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | arm64/INFO | 1 | ||||
| -rw-r--r-- | x86_64/INFO | 1 |
3 files changed, 5 insertions, 1 deletions
@@ -77,7 +77,7 @@ genrule_defaults { "mkdir -p $(genDir)/root/upper/etc/config && " + "cp $(in) $(genDir)/ && " + "mv $(genDir)/*.ipk $(genDir)/root/upper/ipks && " + - "mv $(genDir)/LICENSE $(genDir)/HOW_TO_GET_SOURCE_CODE $(genDir)/root/upper && " + + "mv $(genDir)/LICENSE $(genDir)/HOW_TO_GET_SOURCE_CODE $(genDir)/INFO $(genDir)/root/upper && " + "mv $(genDir)/0_default_config $(genDir)/root/upper/etc/uci-defaults && " + "find $(genDir) -maxdepth 1 -type f -exec mv {} $(genDir)/root/upper/etc/config \\; && " + "ln -s 2 $(genDir)/root/.fs_state && " + @@ -91,6 +91,7 @@ genrule { srcs: [ "x86_64/kmods/*", "x86_64/packages/*", + "x86_64/INFO", ], out: ["openwrt_rootfs_customization_x86_64.img"], defaults: ["openwrt_rootfs_customization_defaults"], @@ -101,6 +102,7 @@ genrule { srcs: [ "arm64/kmods/*", "arm64/packages/*", + "arm64/INFO", ], out: ["openwrt_rootfs_customization_aarch64.img"], defaults: ["openwrt_rootfs_customization_defaults"], diff --git a/arm64/INFO b/arm64/INFO new file mode 100644 index 0000000..b9a33b2 --- /dev/null +++ b/arm64/INFO @@ -0,0 +1 @@ +arch: armvirt_64 diff --git a/x86_64/INFO b/x86_64/INFO new file mode 100644 index 0000000..c2409f5 --- /dev/null +++ b/x86_64/INFO @@ -0,0 +1 @@ +arch: x86_64 |