diff options
author | Seungjae Yoo <seungjaeyoo@google.com> | 2023-01-02 01:57:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-02 01:57:19 +0000 |
commit | 17cab9c94d01cd23eb5ff61c4430902edc69ce7d (patch) | |
tree | cffdd44c3b490170af7574d46263a9f84d98fbfc | |
parent | 54f5bc75d386d42baa05e636b7b67ef5de84da4f (diff) | |
parent | 62d3c860f99e5734642fabb51e6f03c4063ef8c0 (diff) | |
download | openwrt-prebuilts-17cab9c94d01cd23eb5ff61c4430902edc69ce7d.tar.gz |
Reduce duplicated files in OpenWRT am: 62d3c860f9
Original change: https://android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/2369051
Change-Id: I0973da44b76ef1db0bdef66fb1e6abd8544ac118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 165 | ||||
-rw-r--r-- | arm/Android.bp | 74 | ||||
-rw-r--r-- | arm64/images/openwrt-22.03.2-armvirt-64-Image (renamed from arm/images/openwrt-22.03.2-armvirt-64-Image) | bin | 10473480 -> 10473480 bytes | |||
-rw-r--r-- | arm64/images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz (renamed from arm/images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz) | bin | 3451666 -> 3451666 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk) | bin | 179616 -> 179616 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-aead_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-aead_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 982 -> 982 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-ccm_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-ccm_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 967 -> 967 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-cmac_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-cmac_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 3152 -> 3152 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-crc32c_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-crc32c_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 993 -> 993 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-ctr_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-ctr_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 962 -> 962 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-gcm_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-gcm_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 951 -> 951 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-gf128_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-gf128_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 959 -> 959 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-ghash_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-ghash_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 963 -> 963 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-hash_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-hash_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 993 -> 993 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-hmac_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-hmac_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 3337 -> 3337 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-manager_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-manager_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 1004 -> 1004 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-null_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-null_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 945 -> 945 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-rng_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-rng_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 8817 -> 8817 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-seqiv_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-seqiv_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 2761 -> 2761 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-crypto-sha256_5.10.146-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-crypto-sha256_5.10.146-1_aarch64_cortex-a53.ipk) | bin | 6773 -> 6773 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk) | bin | 25268 -> 25268 bytes | |||
-rw-r--r-- | arm64/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk (renamed from arm/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk) | bin | 305218 -> 305218 bytes | |||
-rw-r--r-- | arm64/packages/hostapd-common_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk (renamed from arm/packages/hostapd-common_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk) | bin | 13145 -> 13145 bytes | |||
-rw-r--r-- | arm64/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk (renamed from arm/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk) | bin | 405122 -> 405122 bytes | |||
-rw-r--r-- | arm64/packages/iw_5.16-1_aarch64_cortex-a53.ipk (renamed from arm/packages/iw_5.16-1_aarch64_cortex-a53.ipk) | bin | 49977 -> 49977 bytes | |||
-rw-r--r-- | arm64/packages/iwinfo_2022-08-19-0dad3e66-1_aarch64_cortex-a53.ipk (renamed from arm/packages/iwinfo_2022-08-19-0dad3e66-1_aarch64_cortex-a53.ipk) | bin | 7942 -> 7942 bytes | |||
-rw-r--r-- | arm64/packages/libopenssl1.1_1.1.1s-1_aarch64_cortex-a53.ipk (renamed from arm/packages/libopenssl1.1_1.1.1s-1_aarch64_cortex-a53.ipk) | bin | 1281906 -> 1281906 bytes | |||
-rw-r--r-- | arm64/packages/libubus20220601_2022-06-01-2bebf93c-1_aarch64_cortex-a53.ipk (renamed from arm/packages/libubus20220601_2022-06-01-2bebf93c-1_aarch64_cortex-a53.ipk) | bin | 12131 -> 12131 bytes | |||
-rw-r--r-- | arm64/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk (renamed from arm/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk) | bin | 3966 -> 3966 bytes | |||
-rw-r--r-- | arm64/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk (renamed from arm/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk) | bin | 3837 -> 3837 bytes | |||
-rw-r--r-- | arm64/packages/wireless-regdb_2022.08.12-1_all.ipk (renamed from arm/packages/wireless-regdb_2022.08.12-1_all.ipk) | bin | 2922 -> 2922 bytes | |||
-rw-r--r-- | shared/config/dhcp (renamed from arm/config/dhcp) | 0 | ||||
-rw-r--r-- | shared/config/firewall (renamed from arm/config/firewall) | 0 | ||||
-rw-r--r-- | shared/config/network (renamed from arm/config/network) | 0 | ||||
-rw-r--r-- | shared/config/system (renamed from arm/config/system) | 0 | ||||
-rw-r--r-- | shared/config/wireless (renamed from arm/config/wireless) | 0 | ||||
-rw-r--r-- | shared/uci-defaults/0_default_config (renamed from arm/uci-defaults/0_default_config) | 0 | ||||
-rw-r--r-- | x86/Android.bp | 74 | ||||
-rw-r--r-- | x86/config/dhcp | 52 | ||||
-rw-r--r-- | x86/config/firewall | 169 | ||||
-rw-r--r-- | x86/config/network | 33 | ||||
-rw-r--r-- | x86/config/system | 15 | ||||
-rw-r--r-- | x86/config/wireless | 29 | ||||
-rw-r--r-- | x86/uci-defaults/0_default_config | 4 | ||||
-rw-r--r-- | x86_64/images/openwrt-22.03.2-x86-64-generic-kernel.bin (renamed from x86/images/openwrt-22.03.2-x86-64-generic-kernel.bin) | bin | 5232864 -> 5232864 bytes | |||
-rw-r--r-- | x86_64/images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz (renamed from x86/images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz) | bin | 4946614 -> 4946614 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_x86_64.ipk (renamed from x86/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_x86_64.ipk) | bin | 172369 -> 172369 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-aead_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-aead_5.10.146-1_x86_64.ipk) | bin | 982 -> 982 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-ccm_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-ccm_5.10.146-1_x86_64.ipk) | bin | 956 -> 956 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-cmac_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-cmac_5.10.146-1_x86_64.ipk) | bin | 3146 -> 3146 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-crc32c_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-crc32c_5.10.146-1_x86_64.ipk) | bin | 980 -> 980 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-ctr_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-ctr_5.10.146-1_x86_64.ipk) | bin | 947 -> 947 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-gcm_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-gcm_5.10.146-1_x86_64.ipk) | bin | 945 -> 945 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-gf128_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-gf128_5.10.146-1_x86_64.ipk) | bin | 954 -> 954 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-ghash_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-ghash_5.10.146-1_x86_64.ipk) | bin | 954 -> 954 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-hash_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-hash_5.10.146-1_x86_64.ipk) | bin | 977 -> 977 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-hmac_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-hmac_5.10.146-1_x86_64.ipk) | bin | 3379 -> 3379 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-manager_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-manager_5.10.146-1_x86_64.ipk) | bin | 992 -> 992 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-null_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-null_5.10.146-1_x86_64.ipk) | bin | 941 -> 941 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-rng_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-rng_5.10.146-1_x86_64.ipk) | bin | 9449 -> 9449 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-seqiv_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-seqiv_5.10.146-1_x86_64.ipk) | bin | 2848 -> 2848 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-crypto-sha256_5.10.146-1_x86_64.ipk (renamed from x86/kmods/kmod-crypto-sha256_5.10.146-1_x86_64.ipk) | bin | 13099 -> 13099 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_x86_64.ipk (renamed from x86/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_x86_64.ipk) | bin | 23604 -> 23604 bytes | |||
-rw-r--r-- | x86_64/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_x86_64.ipk (renamed from x86/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_x86_64.ipk) | bin | 292327 -> 292327 bytes | |||
-rw-r--r-- | x86_64/packages/hostapd-common_2022-01-16-cff80b4f-14.1_x86_64.ipk (renamed from x86/packages/hostapd-common_2022-01-16-cff80b4f-14.1_x86_64.ipk) | bin | 13137 -> 13137 bytes | |||
-rw-r--r-- | x86_64/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_x86_64.ipk (renamed from x86/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_x86_64.ipk) | bin | 405914 -> 405914 bytes | |||
-rw-r--r-- | x86_64/packages/iw_5.16-1_x86_64.ipk (renamed from x86/packages/iw_5.16-1_x86_64.ipk) | bin | 48374 -> 48374 bytes | |||
-rw-r--r-- | x86_64/packages/iwinfo_2022-08-19-0dad3e66-1_x86_64.ipk (renamed from x86/packages/iwinfo_2022-08-19-0dad3e66-1_x86_64.ipk) | bin | 7474 -> 7474 bytes | |||
-rw-r--r-- | x86_64/packages/libopenssl1.1_1.1.1s-1_x86_64.ipk (renamed from x86/packages/libopenssl1.1_1.1.1s-1_x86_64.ipk) | bin | 1519376 -> 1519376 bytes | |||
-rw-r--r-- | x86_64/packages/libubus20220601_2022-06-01-2bebf93c-1_x86_64.ipk (renamed from x86/packages/libubus20220601_2022-06-01-2bebf93c-1_x86_64.ipk) | bin | 11477 -> 11477 bytes | |||
-rw-r--r-- | x86_64/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk (renamed from x86/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk) | bin | 3966 -> 3966 bytes | |||
-rw-r--r-- | x86_64/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk (renamed from x86/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk) | bin | 3837 -> 3837 bytes | |||
-rw-r--r-- | x86_64/packages/wireless-regdb_2022.08.12-1_all.ipk (renamed from x86/packages/wireless-regdb_2022.08.12-1_all.ipk) | bin | 2922 -> 2922 bytes |
73 files changed, 136 insertions, 479 deletions
@@ -1,36 +1,15 @@ package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_openwrt-prebuilts_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + // SPDX-license-identifier-GPL-2.0 default_visibility: ["//visibility:private"], default_applicable_licenses: ["external_openwrt-prebuilts_license"], } -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. -// See: http://go/android-license-faq -license { - name: "external_openwrt-prebuilts_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-BSD", - "SPDX-license-identifier-GPL-2.0", - "SPDX-license-identifier-OpenSSL", - ], - license_text: [ - "LICENSE", - ], -} - filegroup { name: "openwrt_license_files", visibility: [":__subpackages__"], @@ -41,7 +20,7 @@ filegroup { } license { - name: "openwrt_license", + name: "external_openwrt-prebuilts_license", visibility: [":__subpackages__"], license_kinds: [ "SPDX-license-identifier-Apache-2.0", @@ -58,3 +37,131 @@ license { "HOW_TO_GET_SOURCE_CODE", ], } + +genrule { + name: "openwrt_rootfs_base_img_x86_64", + srcs: [ + "x86_64/images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz", + ], + out: ["base_rootfs_x86_64.img"], + cmd: "cp $(in) $(genDir) && gzip -d $(genDir)/* && cp $(genDir)/* $(out)", +} + +genrule { + name: "openwrt_rootfs_base_img_aarch64", + srcs: [ + "arm64/images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz", + ], + out: ["base_rootfs_aarch64.img"], + cmd: "cp $(in) $(genDir) && gzip -d $(genDir)/* && cp $(genDir)/* $(out)", +} + +genrule { + name: "openwrt_customization_x86_64", + tools: [ + "make_f2fs", + "sload_f2fs", + ], + srcs: [ + ":openwrt_license_files", + "x86_64/kmods/*", + "x86_64/packages/*", + "shared/uci-defaults/*", + "shared/config/*", + ], + out: ["customization_x86_64.img"], + cmd: "mkdir -p $(genDir)/root/upper/etc/uci-defaults && " + + "mkdir -p $(genDir)/root/upper/ipks && " + + "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)/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 && " + + "truncate -s 128M $(out) && " + + "$(location make_f2fs) $(out) && " + + "$(location sload_f2fs) -f $(genDir)/root -t / $(out)", +} + +genrule { + name: "openwrt_customization_aarch64", + tools: [ + "make_f2fs", + "sload_f2fs", + ], + srcs: [ + ":openwrt_license_files", + "arm64/kmods/*", + "arm64/packages/*", + "shared/uci-defaults/*", + "shared/config/*", + ], + out: ["customization_aarch64.img"], + cmd: "mkdir -p $(genDir)/root/upper/etc/uci-defaults && " + + "mkdir -p $(genDir)/root/upper/ipks && " + + "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)/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 && " + + "truncate -s 128M $(out) && " + + "$(location make_f2fs) $(out) && " + + "$(location sload_f2fs) -f $(genDir)/root -t / $(out)", +} + +genrule { + name: "combined_openwrt_rootfs_x86_64", + tools: [ + "append_squashfs_overlay", + ], + srcs: [ + ":openwrt_rootfs_base_img_x86_64", + ":openwrt_customization_x86_64", + ], + out: ["openwrt_rootfs_x86_64.img"], + cmd: "$(location append_squashfs_overlay) $(in) $(out) -w", +} + +genrule { + name: "combined_openwrt_rootfs_aarch64", + tools: [ + "append_squashfs_overlay", + ], + srcs: [ + ":openwrt_rootfs_base_img_aarch64", + ":openwrt_customization_aarch64", + ], + out: ["openwrt_rootfs_aarch64.img"], + cmd: "$(location append_squashfs_overlay) $(in) $(out) -w", +} + +prebuilt_etc_host { + name: "openwrt_rootfs_x86_64", + src: ":combined_openwrt_rootfs_x86_64", + sub_dir: "openwrt/images", + visibility: ["//device/google/cuttlefish/build"], +} + +prebuilt_etc_host { + name: "openwrt_rootfs_aarch64", + src: ":combined_openwrt_rootfs_aarch64", + sub_dir: "openwrt/images", + visibility: ["//device/google/cuttlefish/build"], +} + +prebuilt_etc_host { + name: "openwrt_kernel_x86_64", + src: "x86_64/images/openwrt-22.03.2-x86-64-generic-kernel.bin", + sub_dir: "openwrt/images", + visibility: ["//device/google/cuttlefish/build"], +} + +prebuilt_etc_host { + name: "openwrt_kernel_aarch64", + src: "arm64/images/openwrt-22.03.2-armvirt-64-Image", + sub_dir: "openwrt/images", + visibility: ["//device/google/cuttlefish/build"], +} diff --git a/arm/Android.bp b/arm/Android.bp deleted file mode 100644 index b7b557b..0000000 --- a/arm/Android.bp +++ /dev/null @@ -1,74 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "openwrt_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-BSD - // SPDX-license-identifier-GPL-2.0 - default_applicable_licenses: ["openwrt_license"], -} - -genrule { - name: "openwrt_customization_aarch64", - tools: [ - "make_f2fs", - "sload_f2fs", - ], - srcs: [ - ":openwrt_license_files", - "kmods/*", - "packages/*", - "uci-defaults/*", - "config/*", - ], - out: ["customization.img"], - cmd: "mkdir -p $(genDir)/root/upper/etc/uci-defaults && " + - "mkdir -p $(genDir)/root/upper/ipks && " + - "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)/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 && " + - "truncate -s 128M $(out) && " + - "$(location make_f2fs) $(out) && " + - "$(location sload_f2fs) -f $(genDir)/root -t / $(out)", -} - -genrule { - name: "openwrt_rootfs_base_img_aarch64", - srcs: [ - "images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz", - ], - out: ["base_rootfs.img"], - cmd: "cp $(in) $(genDir) && gzip -d $(genDir)/* && cp $(genDir)/* $(out)", -} - -genrule { - name: "combined_openwrt_rootfs_aarch64", - tools: [ - "append_squashfs_overlay", - ], - srcs: [ - ":openwrt_rootfs_base_img_aarch64", - ":openwrt_customization_aarch64", - ], - out: ["openwrt_rootfs.img"], - cmd: "$(location append_squashfs_overlay) $(in) $(out) -w", -} - -prebuilt_etc_host { - name: "openwrt_rootfs_aarch64", - src: ":combined_openwrt_rootfs_aarch64", - sub_dir: "openwrt/images", - visibility: ["//device/google/cuttlefish/build"], -} - -prebuilt_etc_host { - name: "openwrt_kernel_aarch64", - src: "images/openwrt-22.03.2-armvirt-64-Image", - sub_dir: "openwrt/images", - visibility: ["//device/google/cuttlefish/build"], -} diff --git a/arm/images/openwrt-22.03.2-armvirt-64-Image b/arm64/images/openwrt-22.03.2-armvirt-64-Image Binary files differindex 8c18120..8c18120 100644 --- a/arm/images/openwrt-22.03.2-armvirt-64-Image +++ b/arm64/images/openwrt-22.03.2-armvirt-64-Image diff --git a/arm/images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz b/arm64/images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz Binary files differindex 261459a..261459a 100644 --- a/arm/images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz +++ b/arm64/images/openwrt-22.03.2-armvirt-64-rootfs-squashfs.img.gz diff --git a/arm/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk Binary files differindex 3aa8d0a..3aa8d0a 100644 --- a/arm/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-aead_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-aead_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex d3d5ae2..d3d5ae2 100644 --- a/arm/kmods/kmod-crypto-aead_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-aead_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-ccm_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-ccm_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 087eea5..087eea5 100644 --- a/arm/kmods/kmod-crypto-ccm_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-ccm_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-cmac_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-cmac_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex a605ebf..a605ebf 100644 --- a/arm/kmods/kmod-crypto-cmac_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-cmac_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-crc32c_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-crc32c_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex d3ad1a3..d3ad1a3 100644 --- a/arm/kmods/kmod-crypto-crc32c_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-crc32c_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-ctr_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-ctr_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex c79558b..c79558b 100644 --- a/arm/kmods/kmod-crypto-ctr_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-ctr_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-gcm_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-gcm_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 7789247..7789247 100644 --- a/arm/kmods/kmod-crypto-gcm_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-gcm_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-gf128_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-gf128_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 777f99c..777f99c 100644 --- a/arm/kmods/kmod-crypto-gf128_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-gf128_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-ghash_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-ghash_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 7b0ed8e..7b0ed8e 100644 --- a/arm/kmods/kmod-crypto-ghash_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-ghash_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-hash_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-hash_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 5915375..5915375 100644 --- a/arm/kmods/kmod-crypto-hash_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-hash_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-hmac_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-hmac_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex dd26443..dd26443 100644 --- a/arm/kmods/kmod-crypto-hmac_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-hmac_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-manager_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-manager_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 5f9bda6..5f9bda6 100644 --- a/arm/kmods/kmod-crypto-manager_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-manager_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-null_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-null_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 06753db..06753db 100644 --- a/arm/kmods/kmod-crypto-null_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-null_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-rng_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-rng_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex c0e84b0..c0e84b0 100644 --- a/arm/kmods/kmod-crypto-rng_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-rng_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-seqiv_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-seqiv_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 45beb08..45beb08 100644 --- a/arm/kmods/kmod-crypto-seqiv_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-seqiv_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-crypto-sha256_5.10.146-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-crypto-sha256_5.10.146-1_aarch64_cortex-a53.ipk Binary files differindex 790f6f8..790f6f8 100644 --- a/arm/kmods/kmod-crypto-sha256_5.10.146-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-crypto-sha256_5.10.146-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk Binary files differindex b42403c..b42403c 100644 --- a/arm/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk diff --git a/arm/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk b/arm64/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk Binary files differindex da6d67c..da6d67c 100644 --- a/arm/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk +++ b/arm64/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_aarch64_cortex-a53.ipk diff --git a/arm/packages/hostapd-common_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk b/arm64/packages/hostapd-common_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk Binary files differindex c6a9d96..c6a9d96 100644 --- a/arm/packages/hostapd-common_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk +++ b/arm64/packages/hostapd-common_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk diff --git a/arm/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk b/arm64/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk Binary files differindex 23374be..23374be 100644 --- a/arm/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk +++ b/arm64/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_aarch64_cortex-a53.ipk diff --git a/arm/packages/iw_5.16-1_aarch64_cortex-a53.ipk b/arm64/packages/iw_5.16-1_aarch64_cortex-a53.ipk Binary files differindex a8737e7..a8737e7 100644 --- a/arm/packages/iw_5.16-1_aarch64_cortex-a53.ipk +++ b/arm64/packages/iw_5.16-1_aarch64_cortex-a53.ipk diff --git a/arm/packages/iwinfo_2022-08-19-0dad3e66-1_aarch64_cortex-a53.ipk b/arm64/packages/iwinfo_2022-08-19-0dad3e66-1_aarch64_cortex-a53.ipk Binary files differindex c133b89..c133b89 100644 --- a/arm/packages/iwinfo_2022-08-19-0dad3e66-1_aarch64_cortex-a53.ipk +++ b/arm64/packages/iwinfo_2022-08-19-0dad3e66-1_aarch64_cortex-a53.ipk diff --git a/arm/packages/libopenssl1.1_1.1.1s-1_aarch64_cortex-a53.ipk b/arm64/packages/libopenssl1.1_1.1.1s-1_aarch64_cortex-a53.ipk Binary files differindex a3ca0bd..a3ca0bd 100644 --- a/arm/packages/libopenssl1.1_1.1.1s-1_aarch64_cortex-a53.ipk +++ b/arm64/packages/libopenssl1.1_1.1.1s-1_aarch64_cortex-a53.ipk diff --git a/arm/packages/libubus20220601_2022-06-01-2bebf93c-1_aarch64_cortex-a53.ipk b/arm64/packages/libubus20220601_2022-06-01-2bebf93c-1_aarch64_cortex-a53.ipk Binary files differindex ea0fee0..ea0fee0 100644 --- a/arm/packages/libubus20220601_2022-06-01-2bebf93c-1_aarch64_cortex-a53.ipk +++ b/arm64/packages/libubus20220601_2022-06-01-2bebf93c-1_aarch64_cortex-a53.ipk diff --git a/arm/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk b/arm64/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk Binary files differindex 1bfacaa..1bfacaa 100644 --- a/arm/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk +++ b/arm64/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk diff --git a/arm/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk b/arm64/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk Binary files differindex a60ed63..a60ed63 100644 --- a/arm/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk +++ b/arm64/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk diff --git a/arm/packages/wireless-regdb_2022.08.12-1_all.ipk b/arm64/packages/wireless-regdb_2022.08.12-1_all.ipk Binary files differindex 2fb08c3..2fb08c3 100644 --- a/arm/packages/wireless-regdb_2022.08.12-1_all.ipk +++ b/arm64/packages/wireless-regdb_2022.08.12-1_all.ipk diff --git a/arm/config/dhcp b/shared/config/dhcp index c55d720..c55d720 100644 --- a/arm/config/dhcp +++ b/shared/config/dhcp diff --git a/arm/config/firewall b/shared/config/firewall index 76f85e7..76f85e7 100644 --- a/arm/config/firewall +++ b/shared/config/firewall diff --git a/arm/config/network b/shared/config/network index 4fae663..4fae663 100644 --- a/arm/config/network +++ b/shared/config/network diff --git a/arm/config/system b/shared/config/system index 269b7f7..269b7f7 100644 --- a/arm/config/system +++ b/shared/config/system diff --git a/arm/config/wireless b/shared/config/wireless index 7232d47..7232d47 100644 --- a/arm/config/wireless +++ b/shared/config/wireless diff --git a/arm/uci-defaults/0_default_config b/shared/uci-defaults/0_default_config index 093006f..093006f 100644 --- a/arm/uci-defaults/0_default_config +++ b/shared/uci-defaults/0_default_config diff --git a/x86/Android.bp b/x86/Android.bp deleted file mode 100644 index ea8ed25..0000000 --- a/x86/Android.bp +++ /dev/null @@ -1,74 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "openwrt_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-BSD - // SPDX-license-identifier-GPL-2.0 - default_applicable_licenses: ["openwrt_license"], -} - -genrule { - name: "openwrt_customization_x86_64", - tools: [ - "make_f2fs", - "sload_f2fs", - ], - srcs: [ - ":openwrt_license_files", - "kmods/*", - "packages/*", - "uci-defaults/*", - "config/*", - ], - out: ["customization.img"], - cmd: "mkdir -p $(genDir)/root/upper/etc/uci-defaults && " + - "mkdir -p $(genDir)/root/upper/ipks && " + - "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)/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 && " + - "truncate -s 128M $(out) && " + - "$(location make_f2fs) $(out) && " + - "$(location sload_f2fs) -f $(genDir)/root -t / $(out)", -} - -genrule { - name: "openwrt_rootfs_base_img_x86_64", - srcs: [ - "images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz", - ], - out: ["base_rootfs.img"], - cmd: "cp $(in) $(genDir) && gzip -d $(genDir)/* && cp $(genDir)/* $(out)", -} - -genrule { - name: "combined_openwrt_rootfs_x86_64", - tools: [ - "append_squashfs_overlay", - ], - srcs: [ - ":openwrt_rootfs_base_img_x86_64", - ":openwrt_customization_x86_64", - ], - out: ["openwrt_rootfs.img"], - cmd: "$(location append_squashfs_overlay) $(in) $(out) -w", -} - -prebuilt_etc_host { - name: "openwrt_rootfs_x86_64", - src: ":combined_openwrt_rootfs_x86_64", - sub_dir: "openwrt/images", - visibility: ["//device/google/cuttlefish/build"], -} - -prebuilt_etc_host { - name: "openwrt_kernel_x86_64", - src: "images/openwrt-22.03.2-x86-64-generic-kernel.bin", - sub_dir: "openwrt/images", - visibility: ["//device/google/cuttlefish/build"], -} diff --git a/x86/config/dhcp b/x86/config/dhcp deleted file mode 100644 index c55d720..0000000 --- a/x86/config/dhcp +++ /dev/null @@ -1,52 +0,0 @@ -config dnsmasq - option domainneeded '1' - option boguspriv '1' - option filterwin2k '0' - option localise_queries '1' - option rebind_protection '1' - option rebind_localhost '1' - option local '/lan/' - option domain 'lan' - option expandhosts '1' - option nonegcache '0' - option authoritative '1' - option readethers '1' - option leasefile '/tmp/dhcp.leases' - option resolvfile '/tmp/resolv.conf.d/resolv.conf.auto' - option nonwildcard '1' - option localservice '1' - option ednspacket_max '1232' - -config dhcp 'lan' - option interface 'lan' - option start '100' - option limit '150' - option leasetime '12h' - option dhcpv4 'server' - option dhcpv6 'server' - option ra 'server' - option ra_slaac '1' - list ra_flags 'managed-config' - list ra_flags 'other-config' - -config dhcp 'wan' - option interface 'wan' - option ignore '1' - -config odhcpd 'odhcpd' - option maindhcp '0' - option leasefile '/tmp/hosts/odhcpd' - option leasetrigger '/usr/sbin/odhcpd-update' - option loglevel '4' - -config 'dhcp' 'wifi' - option 'interface' 'wifi' - option 'start' '100' - option 'limit' '150' - option 'leasetime' '12h' - -config 'dhcp' 'wifi2' - option 'interface' 'wifi2' - option 'start' '100' - option 'limit' '150' - option 'leasetime' '12h' diff --git a/x86/config/firewall b/x86/config/firewall deleted file mode 100644 index 76f85e7..0000000 --- a/x86/config/firewall +++ /dev/null @@ -1,169 +0,0 @@ -config defaults - option syn_flood '1' - option input 'ACCEPT' - option output 'ACCEPT' - option forward 'REJECT' - -config zone - option name wifi - list network 'wifi' - option input ACCEPT - option output ACCEPT - option forward REJECT - -config 'forwarding' - option 'src' 'wifi' - option 'dest' 'wan' - -config zone - option name wifi2 - list network 'wifi2' - option input ACCEPT - option output ACCEPT - option forward REJECT - -config 'forwarding' - option 'src' 'wifi2' - option 'dest' 'wan' - -config zone - option name 'lan' - list network 'lan' - option input 'ACCEPT' - option output 'ACCEPT' - option forward 'ACCEPT' - -config zone - option name 'wan' - list network 'wan' - list network 'wan6' - option input 'REJECT' - option output 'ACCEPT' - option forward 'REJECT' - option masq '1' - option mtu_fix '1' - -config forwarding - option src 'lan' - option dest 'wan' - -config rule - option name 'Allow-DHCP-Renew' - option src 'wan' - option proto 'udp' - option dest_port '68' - option target 'ACCEPT' - option family 'ipv4' - -config rule - option name 'Allow-Ping' - option src 'wan' - option proto 'icmp' - option icmp_type 'echo-request' - option family 'ipv4' - option target 'ACCEPT' - -config rule - option name 'Allow-IGMP' - option src 'wan' - option proto 'igmp' - option family 'ipv4' - option target 'ACCEPT' - -config rule - option name 'Allow-DHCPv6' - option src 'wan' - option proto 'udp' - option src_ip 'fc00::/6' - option dest_ip 'fc00::/6' - option dest_port '546' - option family 'ipv6' - option target 'ACCEPT' - -config rule - option name 'Allow-MLD' - option src 'wan' - option proto 'icmp' - option src_ip 'fe80::/10' - list icmp_type '130/0' - list icmp_type '131/0' - list icmp_type '132/0' - list icmp_type '143/0' - option family 'ipv6' - option target 'ACCEPT' - -config rule - option name 'Allow-ICMPv6-Input' - option src 'wan' - option proto 'icmp' - list icmp_type 'echo-request' - list icmp_type 'echo-reply' - list icmp_type 'destination-unreachable' - list icmp_type 'packet-too-big' - list icmp_type 'time-exceeded' - list icmp_type 'bad-header' - list icmp_type 'unknown-header-type' - list icmp_type 'router-solicitation' - list icmp_type 'neighbour-solicitation' - list icmp_type 'router-advertisement' - list icmp_type 'neighbour-advertisement' - option limit '1000/sec' - option family 'ipv6' - option target 'ACCEPT' - -config rule - option name 'Allow-ICMPv6-Forward' - option src 'wan' - option dest '*' - option proto 'icmp' - list icmp_type 'echo-request' - list icmp_type 'echo-reply' - list icmp_type 'destination-unreachable' - list icmp_type 'packet-too-big' - list icmp_type 'time-exceeded' - list icmp_type 'bad-header' - list icmp_type 'unknown-header-type' - option limit '1000/sec' - option family 'ipv6' - option target 'ACCEPT' - -config rule - option name 'Allow-IPSec-ESP' - option src 'wan' - option dest 'lan' - option proto 'esp' - option target 'ACCEPT' - -config rule - option name 'Allow-ISAKMP' - option src 'wan' - option dest 'lan' - option dest_port '500' - option proto 'udp' - option target 'ACCEPT' - -config rule - option name 'Support-UDP-Traceroute' - option src 'wan' - option dest_port '33434:33689' - option proto 'udp' - option family 'ipv4' - option target 'REJECT' - option enabled 'false' - -config include - option path '/etc/firewall.user' - -config rule - option name 'Allow SSH' - option src 'wan' - option target 'ACCEPT' - option proto 'tcp' - option dest_port '22' - -config rule - option name 'Allow LuCI' - option src 'wan' - option target 'ACCEPT' - option proto 'tcp' - option dest_port '80 443' diff --git a/x86/config/network b/x86/config/network deleted file mode 100644 index b146475..0000000 --- a/x86/config/network +++ /dev/null @@ -1,33 +0,0 @@ -config interface 'loopback' - option device 'lo' - option proto 'static' - option ipaddr '127.0.0.1' - option netmask '255.0.0.0' - -config globals 'globals' - option ula_prefix 'fd72:5afb:a7cf::/48' - -config device - option name 'br-lan' - option type 'bridge' - list ports 'eth0' - -config interface 'wan' - option device 'br-lan' - option proto 'static' - option netmask '255.255.255.0' - option ipaddr '192.168.96.2' - option ip6assign '30' - option gateway '192.168.96.1' - option dns '8.8.8.8' - option broadcast '192.168.96.3' - -config 'interface' 'wifi' - option 'proto' 'static' - option 'ipaddr' '192.168.2.1' - option 'netmask' '255.255.255.0' - -config 'interface' 'wifi2' - option 'proto' 'static' - option 'ipaddr' '192.168.3.1' - option 'netmask' '255.255.255.0'
\ No newline at end of file diff --git a/x86/config/system b/x86/config/system deleted file mode 100644 index 269b7f7..0000000 --- a/x86/config/system +++ /dev/null @@ -1,15 +0,0 @@ -config system - option hostname 'OpenWrt' - option timezone 'UTC' - option ttylogin '0' - option log_size '64' - option urandom_seed '0' - option log_file '/dev/hvc0' - -config timeserver 'ntp' - option enabled '1' - option enable_server '0' - list server '0.openwrt.pool.ntp.org' - list server '1.openwrt.pool.ntp.org' - list server '2.openwrt.pool.ntp.org' - list server '3.openwrt.pool.ntp.org' diff --git a/x86/config/wireless b/x86/config/wireless deleted file mode 100644 index b91cbdf..0000000 --- a/x86/config/wireless +++ /dev/null @@ -1,29 +0,0 @@ -config wifi-device 'radio0' - option type 'mac80211' - option channel '36' - option hwmode '11a' - option path 'virtual/mac80211_hwsim/hwsim0' - option htmode 'VHT80' - option disabled '0' - -config wifi-iface 'default_radio0' - option device 'radio0' - option mode 'ap' - option encryption 'none' - option network 'wifi' - option ssid 'VirtWifi' - -config wifi-device 'radio1' - option type 'mac80211' - option channel '36' - option hwmode '11a' - option path 'virtual/mac80211_hwsim/hwsim1' - option htmode 'VHT80' - option disabled '0' - -config wifi-iface 'default_radio1' - option device 'radio1' - option mode 'ap' - option encryption 'none' - option network 'wifi2' - option ssid 'VirtWifi2' diff --git a/x86/uci-defaults/0_default_config b/x86/uci-defaults/0_default_config deleted file mode 100644 index 093006f..0000000 --- a/x86/uci-defaults/0_default_config +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -opkg install /ipks/* -ip link set eth0 mtu 1460 -reboot diff --git a/x86/images/openwrt-22.03.2-x86-64-generic-kernel.bin b/x86_64/images/openwrt-22.03.2-x86-64-generic-kernel.bin Binary files differindex 23b61de..23b61de 100644 --- a/x86/images/openwrt-22.03.2-x86-64-generic-kernel.bin +++ b/x86_64/images/openwrt-22.03.2-x86-64-generic-kernel.bin diff --git a/x86/images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz b/x86_64/images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz Binary files differindex a28b772..a28b772 100644 --- a/x86/images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz +++ b/x86_64/images/openwrt-22.03.2-x86-64-generic-squashfs-rootfs.img.gz diff --git a/x86/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_x86_64.ipk b/x86_64/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_x86_64.ipk Binary files differindex 5cd61b9..5cd61b9 100644 --- a/x86/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_x86_64.ipk +++ b/x86_64/kmods/kmod-cfg80211_5.10.146+5.15.58-1-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-aead_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-aead_5.10.146-1_x86_64.ipk Binary files differindex 1ddd3cb..1ddd3cb 100644 --- a/x86/kmods/kmod-crypto-aead_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-aead_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-ccm_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-ccm_5.10.146-1_x86_64.ipk Binary files differindex 05ca513..05ca513 100644 --- a/x86/kmods/kmod-crypto-ccm_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-ccm_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-cmac_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-cmac_5.10.146-1_x86_64.ipk Binary files differindex b5ce24e..b5ce24e 100644 --- a/x86/kmods/kmod-crypto-cmac_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-cmac_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-crc32c_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-crc32c_5.10.146-1_x86_64.ipk Binary files differindex 4a15253..4a15253 100644 --- a/x86/kmods/kmod-crypto-crc32c_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-crc32c_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-ctr_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-ctr_5.10.146-1_x86_64.ipk Binary files differindex 5310d0d..5310d0d 100644 --- a/x86/kmods/kmod-crypto-ctr_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-ctr_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-gcm_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-gcm_5.10.146-1_x86_64.ipk Binary files differindex c4b06a3..c4b06a3 100644 --- a/x86/kmods/kmod-crypto-gcm_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-gcm_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-gf128_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-gf128_5.10.146-1_x86_64.ipk Binary files differindex aa614cf..aa614cf 100644 --- a/x86/kmods/kmod-crypto-gf128_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-gf128_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-ghash_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-ghash_5.10.146-1_x86_64.ipk Binary files differindex 8738b43..8738b43 100644 --- a/x86/kmods/kmod-crypto-ghash_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-ghash_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-hash_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-hash_5.10.146-1_x86_64.ipk Binary files differindex 9b8a49d..9b8a49d 100644 --- a/x86/kmods/kmod-crypto-hash_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-hash_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-hmac_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-hmac_5.10.146-1_x86_64.ipk Binary files differindex 2b37a3b..2b37a3b 100644 --- a/x86/kmods/kmod-crypto-hmac_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-hmac_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-manager_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-manager_5.10.146-1_x86_64.ipk Binary files differindex 734c650..734c650 100644 --- a/x86/kmods/kmod-crypto-manager_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-manager_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-null_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-null_5.10.146-1_x86_64.ipk Binary files differindex a9a4fba..a9a4fba 100644 --- a/x86/kmods/kmod-crypto-null_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-null_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-rng_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-rng_5.10.146-1_x86_64.ipk Binary files differindex f4d720a..f4d720a 100644 --- a/x86/kmods/kmod-crypto-rng_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-rng_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-seqiv_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-seqiv_5.10.146-1_x86_64.ipk Binary files differindex 8d8cb91..8d8cb91 100644 --- a/x86/kmods/kmod-crypto-seqiv_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-seqiv_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-crypto-sha256_5.10.146-1_x86_64.ipk b/x86_64/kmods/kmod-crypto-sha256_5.10.146-1_x86_64.ipk Binary files differindex 76fb057..76fb057 100644 --- a/x86/kmods/kmod-crypto-sha256_5.10.146-1_x86_64.ipk +++ b/x86_64/kmods/kmod-crypto-sha256_5.10.146-1_x86_64.ipk diff --git a/x86/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_x86_64.ipk b/x86_64/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_x86_64.ipk Binary files differindex 61777b3..61777b3 100644 --- a/x86/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_x86_64.ipk +++ b/x86_64/kmods/kmod-mac80211-hwsim_5.10.146+5.15.58-1-1_x86_64.ipk diff --git a/x86/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_x86_64.ipk b/x86_64/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_x86_64.ipk Binary files differindex 421a081..421a081 100644 --- a/x86/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_x86_64.ipk +++ b/x86_64/kmods/kmod-mac80211_5.10.146+5.15.58-1-1_x86_64.ipk diff --git a/x86/packages/hostapd-common_2022-01-16-cff80b4f-14.1_x86_64.ipk b/x86_64/packages/hostapd-common_2022-01-16-cff80b4f-14.1_x86_64.ipk Binary files differindex 874945a..874945a 100644 --- a/x86/packages/hostapd-common_2022-01-16-cff80b4f-14.1_x86_64.ipk +++ b/x86_64/packages/hostapd-common_2022-01-16-cff80b4f-14.1_x86_64.ipk diff --git a/x86/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_x86_64.ipk b/x86_64/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_x86_64.ipk Binary files differindex 5af13c6..5af13c6 100644 --- a/x86/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_x86_64.ipk +++ b/x86_64/packages/hostapd-openssl_2022-01-16-cff80b4f-14.1_x86_64.ipk diff --git a/x86/packages/iw_5.16-1_x86_64.ipk b/x86_64/packages/iw_5.16-1_x86_64.ipk Binary files differindex 0fa98f6..0fa98f6 100644 --- a/x86/packages/iw_5.16-1_x86_64.ipk +++ b/x86_64/packages/iw_5.16-1_x86_64.ipk diff --git a/x86/packages/iwinfo_2022-08-19-0dad3e66-1_x86_64.ipk b/x86_64/packages/iwinfo_2022-08-19-0dad3e66-1_x86_64.ipk Binary files differindex dff15e0..dff15e0 100644 --- a/x86/packages/iwinfo_2022-08-19-0dad3e66-1_x86_64.ipk +++ b/x86_64/packages/iwinfo_2022-08-19-0dad3e66-1_x86_64.ipk diff --git a/x86/packages/libopenssl1.1_1.1.1s-1_x86_64.ipk b/x86_64/packages/libopenssl1.1_1.1.1s-1_x86_64.ipk Binary files differindex 80534d0..80534d0 100644 --- a/x86/packages/libopenssl1.1_1.1.1s-1_x86_64.ipk +++ b/x86_64/packages/libopenssl1.1_1.1.1s-1_x86_64.ipk diff --git a/x86/packages/libubus20220601_2022-06-01-2bebf93c-1_x86_64.ipk b/x86_64/packages/libubus20220601_2022-06-01-2bebf93c-1_x86_64.ipk Binary files differindex 8dc0043..8dc0043 100644 --- a/x86/packages/libubus20220601_2022-06-01-2bebf93c-1_x86_64.ipk +++ b/x86_64/packages/libubus20220601_2022-06-01-2bebf93c-1_x86_64.ipk diff --git a/x86/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk b/x86_64/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk Binary files differindex 1bfacaa..1bfacaa 100644 --- a/x86/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk +++ b/x86_64/packages/luci-lib-json_git-18.184.37844-cde13dc_all.ipk diff --git a/x86/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk b/x86_64/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk Binary files differindex a60ed63..a60ed63 100644 --- a/x86/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk +++ b/x86_64/packages/luci-mod-rpc_git-21.020.56896-af422b1_all.ipk diff --git a/x86/packages/wireless-regdb_2022.08.12-1_all.ipk b/x86_64/packages/wireless-regdb_2022.08.12-1_all.ipk Binary files differindex 2fb08c3..2fb08c3 100644 --- a/x86/packages/wireless-regdb_2022.08.12-1_all.ipk +++ b/x86_64/packages/wireless-regdb_2022.08.12-1_all.ipk |