FEX-Emu/FEX
1
0
Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2024-11-26 16:20:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

New domain.

Browse Source 
Needed to fix FEXRootFSFetcher from #1967
This commit is contained in:
Ryan Houdek 2022-09-02 10:43:07 -07:00
parent 98dbfbe654
commit cc7fb008fc
7 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -476,7 +476,7 @@ endif()
set (CPACK_GENERATOR "DEB")
set (CPACK_PACKAGE_NAME fex-emu)
set (CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${GIT_DESCRIBE_STRING}_${CMAKE_SYSTEM_PROCESSOR}")
set (CPACK_PACKAGE_CONTACT "FEX-Emu Maintainers <team@fex-emu.org>")
set (CPACK_PACKAGE_CONTACT "FEX-Emu Maintainers <team@fex-emu.com>")
set (CPACK_PACKAGE_VERSION_MAJOR "${FEX_VERSION_MAJOR}")
set (CPACK_PACKAGE_VERSION_MINOR "${FEX_VERSION_MINOR}")
set (CPACK_PACKAGE_VERSION_PATCH "${FEX_VERSION_PATCH}")

2
CODE_OF_CONDUCT.md
View File

@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at team@fex-emu.org. All
reported by contacting the project team at team@fex-emu.com. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.

4
Readme.md
View File

@ -30,11 +30,11 @@ On AArch64 hosts the user **MUST** have an x86-64 RootFS [Creating a RootFS](#Ro
See the [Source Outline](docs/SourceOutline.md) for more information.
### Building FEX
Follow the guide on the official FEX-Emu Wiki [here](https://wiki.fex-emu.org/index.php/Development:Setting_up_FEX).
Follow the guide on the official FEX-Emu Wiki [here](https://wiki.fex-emu.com/index.php/Development:Setting_up_FEX).
### RootFS generation
AArch64 hosts require a rootfs for running applications.
Follow the guide on the wiki page for seeing how to set up the rootfs from scratch
https://wiki.fex-emu.org/index.php/Development:Setting_up_RootFS
https://wiki.fex-emu.com/index.php/Development:Setting_up_RootFS
![FEX diagram](docs/Diagram.svg)

4
Scripts/InstallFEX.py
View File

@ -306,12 +306,14 @@ def GetRootFSPath():
return _RootFSPath
def CheckRootFSInstallStatus():
# Matches what is available on https://rootfs.fex-emu.org/file/fex-rootfs/RootFS_links_XXH3.txt
# Matches what is available on https://rootfs.fex-emu.com/file/fex-rootfs/RootFS_links.json
UbuntuVersionToRootFS = {
"20.04": "Ubuntu_21_04.sqsh",
"21.04": "Ubuntu_21_04.sqsh",
"21.10": "Ubuntu_21_10.sqsh",
"21.10": "Ubuntu_21_10.ero",
"22.04": "Ubuntu_22_04.sqsh",
"22.04": "Ubuntu_22_04.ero",
}
return os.path.exists(GetRootFSPath() + UbuntuVersionToRootFS[GetDistro()[1]])

2
Source/Tools/FEXRootFSFetcher/Main.cpp
View File

@ -441,7 +441,7 @@ namespace WebFileFetcher {
FileType Type;
};
const static std::string DownloadURL = "https://rootfs.fex-emu.org/file/fex-rootfs/RootFS_links.json";
const static std::string DownloadURL = "https://rootfs.fex-emu.com/file/fex-rootfs/RootFS_links.json";
std::string DownloadToString(const std::string &URL) {
std::string BigArgs =

6
docs/Readme_CN.md
View File

@ -17,7 +17,7 @@ FEX处于重度开发阶段，所以会有很多改善。
Ubuntu下的PPA 随FEX月度发布更新。
### 其他系统
参考[这里](https://wiki.fex-emu.org/index.php/QuickStartGuide)
参考[这里](https://wiki.fex-emu.com/index.php/QuickStartGuide)
## 开始
FEX在ARMv8.0，ARMv8.1+和x86-64(支持AVX或更新处理器)硬件上进行过编译和运行测试。
@ -64,10 +64,10 @@ sudo ninja binfmt_misc_64
### 更多信息
更多关于FEX和平台相关的设置信息请参考以下维基页面：
https://wiki.fex-emu.org/index.php/Development:Setting_up_FEX
https://wiki.fex-emu.com/index.php/Development:Setting_up_FEX
### 创建RootFS
AArch64 host端需要一个rootfs去运行guest程序。参考以下维基页面从头开始创建一个rootfs
https://wiki.fex-emu.org/index.php/Development:Setting_up_RootFS
https://wiki.fex-emu.com/index.php/Development:Setting_up_RootFS
![FEX diagram](Diagram.svg)

16
docs/ReleaseProcess.md
View File

@ -8,7 +8,7 @@ If a tagged version was being done on `Sun, 02 Jan 2022` then the FEX version wo
There are multiple locations that need to be updated during a release
* Github tagged release
* Github releases page
* fex-emu.org blog post
* fex-emu.com blog post
* https://launchpad.net/~fex-emu/+archive/ubuntu/fex Ubuntu PPA
* @FEX_Emu twitter account
@ -41,8 +41,8 @@ $ git push upstream main
* Fairly trivial cleanups, it's more just a developer focused changelog
* Click publish release
## fex-emu.org blog post steps
* clone https://github.com/FEX-Emu/fex-emu.org
## fex-emu.com blog post steps
* clone https://github.com/FEX-Emu/fex-emu.com
* Copy the previous post from the _posts/ folder to a new markdown file
* Ensure correct date format in filename
* Copy github release pages markdown in to this
@ -53,7 +53,7 @@ $ git push upstream main
* Short blurb in the top paragraph if desired
* push new md file to the repo. Either in direct push or PR
* Jekyll will automatically regenerate the website with a github action
* Verify that the post shows up on the site at fex-emu.org
* Verify that the post shows up on the site at fex-emu.com
## Launchpad PPA steps
Follow the steps in: https://github.com/FEX-Emu/FEX-ppa/blob/main/README_ppa.md
@ -71,7 +71,7 @@ Follow the steps in: https://github.com/FEX-Emu/FEX-ppa/blob/main/README_ppa.md
## @FEX_Emu twitter account steps
* Requires @FEX_Emu twitter account access
* Create a tweet with some small blurb/sizzle text about some relevant changes in this tagged version
* Link to the fex-emu.org blog post about the change
* Link to the fex-emu.com blog post about the change
## RootFS image updating
* This doesn't typically need to be done on a monthly basis
@ -80,7 +80,7 @@ Follow the steps in: https://github.com/FEX-Emu/FEX-ppa/blob/main/README_ppa.md
* Follow the Build_Data file's information for how to generate an image using `build_image.py`
* This gives a squashfs image for the rootfs
* Use FEXRootFSFetcher <image.sqsh> to generate the xxhash for the image
* Update `https://rootfs.fex-emu.org/file/fex-rootfs/RootFS_links_XXH3.txt` with the new rootfs image and hash
* Update `https://rootfs.fex-emu.com/file/fex-rootfs/RootFS_links.json` with the new rootfs image and hash
* This currently lives in a private FEX-Emu backblaze bucket with cloudflare servicing it.
* Never publically give the direct backblaze link to the file. Will cause BW costs to skyrocket
* Always pass through cloudflare
@ -88,9 +88,9 @@ Follow the steps in: https://github.com/FEX-Emu/FEX-ppa/blob/main/README_ppa.md
* Upload new image to Backblaze using the b2 upload tool
* b2 upload-file <bucketname> <image.sqsh> <Image folder name>/<image.sqsh>
* Upload the new RootFS_links_XXH3.txt
* Upload the new RootFS_links.json
* Lives in the root of the bucket
* b2 upload-file <bucketname> RootFS_links_XXH3.txt RootFS_links_XXH3.txt
* b2 upload-file <bucketname> RootFS_links.json RootFS_links.json
* Once uploaded it should propagate immediately
* Might be worth thinking about the coherency problem of updating the hash versus image independently if overwriting an image