ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 14:37:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

depot_remove.run: replace x86_64 by [depot_spec]

Browse Source 
This change makes the run script compatible with all CPU architectures.

Issue genodelabs#4866
This commit is contained in:
Alice Domage 2023-06-16 12:13:55 +02:00 committed by Norman Feske
parent c888fcbdd9
commit 943c9809ed
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
repos/gems/run/depot_remove.run
View File

@ -1,5 +1,4 @@
assert_spec linux assert_spec linux
assert_spec x86_64
create_boot_directory create_boot_directory
@ -169,7 +168,7 @@ proc check_depot_state { context } {
regexp [_depot_archive_versioned_path_pattern] $archive dummy archive_user archive_type archive_name regexp [_depot_archive_versioned_path_pattern] $archive dummy archive_user archive_type archive_name
if { $archive_type == "src" } { if { $archive_type == "src" } {
set archive $archive_user/bin/x86_64/$archive_name/[_current_depot_archive_version src $archive_name] set archive $archive_user/bin/[depot_spec]/$archive_name/[_current_depot_archive_version src $archive_name]
} }
if { [file isdirectory [run_dir]/genode/depot/$archive] } { if { [file isdirectory [run_dir]/genode/depot/$archive] } {
@ -183,7 +182,7 @@ proc check_depot_state { context } {
regexp [_depot_archive_versioned_path_pattern] $archive dummy archive_user archive_type archive_name regexp [_depot_archive_versioned_path_pattern] $archive dummy archive_user archive_type archive_name
if { $archive_type == "src" } { if { $archive_type == "src" } {
set archive $archive_user/bin/x86_64/$archive_name/[_current_depot_archive_version src $archive_name] set archive $archive_user/bin/[depot_spec]/$archive_name/[_current_depot_archive_version src $archive_name]
} }
if { ![file isdirectory [run_dir]/genode/depot/$archive] } { if { ![file isdirectory [run_dir]/genode/depot/$archive] } {
@ -205,7 +204,7 @@ proc check_depot_state { context } {
set context [depot_state_for_pkg "nano3d"] set context [depot_state_for_pkg "nano3d"]
install_test_config { install_test_config {
<config arch="x86_64" report="yes"> <config arch="} [depot_spec] {" report="yes">
<remove user="} [depot_user] {" pkg="nano3d"/> <remove user="} [depot_user] {" pkg="nano3d"/>
<vfs> <dir name="depot"> <fs/> </dir> </vfs> <vfs> <dir name="depot"> <fs/> </dir> </vfs>
</config> </config>
@ -225,7 +224,7 @@ puts " TEST 1 --- Delete nano3d -- SUCCESS"
set context [depot_state] set context [depot_state]
install_test_config { install_test_config {
<config arch="x86_64" report="yes"> <config arch="} [depot_spec] {" report="yes">
<remove user="} [depot_user] {" pkg="nano3d"/> <remove user="} [depot_user] {" pkg="nano3d"/>
<vfs> <dir name="depot"> <fs/> </dir> </vfs> <vfs> <dir name="depot"> <fs/> </dir> </vfs>
</config> </config>
@ -245,7 +244,7 @@ puts " TEST 2 --- Delete non existing archive -- SUCCESS"
set context [depot_state_for_pkg "fonts_fs"] set context [depot_state_for_pkg "fonts_fs"]
install_test_config { install_test_config {
<config arch="x86_64" report="yes"> <config arch="} [depot_spec] {" report="yes">
<remove user="} [depot_user] {" pkg="fonts_fs"/> <remove user="} [depot_user] {" pkg="fonts_fs"/>
<vfs> <dir name="depot"> <fs/> </dir> </vfs> <vfs> <dir name="depot"> <fs/> </dir> </vfs>
</config> </config>
@ -265,7 +264,7 @@ puts " TEST 3 --- Delete a PKG archive with deps to keep --- SUCCESS"
set context [depot_state_for_pkg "themed_decorator"] set context [depot_state_for_pkg "themed_decorator"]
install_test_config { install_test_config {
<config arch="x86_64" report="yes"> <config arch="} [depot_spec] {" report="yes">
<remove-all> <remove-all>
<keep user="} [depot_user] {" pkg="themed_decorator"/> <keep user="} [depot_user] {" pkg="themed_decorator"/>
</remove-all> </remove-all>