@@ -50,11 +50,11 @@ def fix_socket_header(filename):
50
50
f . write (line )
51
51
52
52
# Support for SwiftPM fetching packages and their GitHub submodules
53
- do_swift_package_resolve [depends ] += "unzip-native:do_populate_sysroot swift-native:do_populate_sysroot"
54
- do_swift_package_resolve [network ] = "1"
55
- do_swift_package_resolve [vardepsexclude ] = "BB_ORIGENV"
53
+ swift_do_package_resolve [depends ] += "unzip-native:do_populate_sysroot swift-native:do_populate_sysroot"
54
+ swift_do_package_resolve [network ] = "1"
55
+ swift_do_package_resolve [vardepsexclude ] = "BB_ORIGENV"
56
56
57
- python do_swift_package_resolve () {
57
+ python swift_do_package_resolve () {
58
58
import subprocess
59
59
import os
60
60
@@ -79,7 +79,7 @@ python do_swift_package_resolve() {
79
79
bb . fatal ('git submodule update failed' )
80
80
}
81
81
82
- addtask swift_package_resolve after do_unpack before do_compile
82
+ addtask do_package_resolve after do_unpack before do_compile
83
83
84
84
python swift_do_configure () {
85
85
import os
@@ -205,7 +205,7 @@ python swift_do_configure() {
205
205
configJSON . close ()
206
206
}
207
207
208
- # ideally this should be handled by do_swift_package_resolve but doesn't always appear to be the case
208
+ # ideally this should be handled by swift_do_package_resolve but doesn't always appear to be the case
209
209
do_compile [network ] = "1"
210
210
swift_do_compile [vardepsexclude ] = "BB_ORIGENV"
211
211
@@ -266,4 +266,4 @@ do_package_update() {
266
266
do_package_update [network ] = "1"
267
267
addtask do_package_update after do_configure
268
268
269
- EXPORT_FUNCTIONS do_configure do_compile do_package_update
269
+ EXPORT_FUNCTIONS do_package_resolve do_configure do_compile do_package_update
0 commit comments