Skip to content

Commit f1964ff

Browse files
committed
update instructions
1 parent a3d546d commit f1964ff

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

toolkit/docs/building/building.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Depending on hardware, rebuilding the toolchain can take several hours. The foll
134134

135135
```bash
136136
# Add REBUILD_TOOLCHAIN=y to any subsequent command to ensure locally built toolchain packages are used
137-
sudo make toolchain REBUILD_TOOLS=y REBUILD_TOOLCHAIN=y DOWNLOAD_SRPMS=y
137+
sudo make toolchain REBUILD_TOOLS=y REBUILD_TOOLCHAIN=y SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
138138
```
139139

140140
## **Package Stage**
@@ -153,11 +153,11 @@ The following command rebuilds all CBL-Mariner packages.
153153

154154
```bash
155155
# Build ALL packages FOR AMD64
156-
sudo make build-packages -j$(nproc) CONFIG_FILE= DOWNLOAD_SRPMS=y REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8 openjdk8_aarch64 shim-unsigned-aarch64"
156+
sudo make build-packages -j$(nproc) CONFIG_FILE= REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8" SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
157157

158158
# Build ALL packages FOR ARM64
159159
# (NOTE: CBL-Mariner compiles natively, an ARM64 build machine is required to create ARM64 packages/images)
160-
sudo make build-packages -j$(nproc) CONFIG_FILE= DOWNLOAD_SRPMS=y REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8 openjdk8_aarch64 shim-unsigned-amd64"
160+
sudo make build-packages -j$(nproc) CONFIG_FILE= REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8_aarch64" SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
161161
```
162162

163163
### **Rebuild Minimal Required Packages**
@@ -166,11 +166,11 @@ The following command rebuilds packages for the basic VHD.
166166

167167
```bash
168168
# Build ALL packages FOR AMD64
169-
sudo make build-packages -j$(nproc) CONFIG_FILE=./imageconfigs/core-legacy.json DOWNLOAD_SRPMS=y REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8 openjdk8_aarch64 shim-unsigned-aarch64"
169+
sudo make build-packages -j$(nproc) CONFIG_FILE=./imageconfigs/core-legacy.json REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8" SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
170170

171171
# Build ALL packages FOR ARM64
172172
# (NOTE: CBL-Mariner compiles natively, an ARM64 build machine is required to create ARM64 packages/images)
173-
sudo make build-packages -j$(nproc) CONFIG_FILE=./imageconfigs/core-legacy.json DOWNLOAD_SRPMS=y REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8 openjdk8_aarch64 shim-unsigned-amd64"
173+
sudo make build-packages -j$(nproc) CONFIG_FILE=./imageconfigs/core-legacy.json REBUILD_TOOLS=y PACKAGE_IGNORE_LIST="openjdk8_aarch64" SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
174174
```
175175

176176
Note that the image build commands in [Build Images](#build-images) will **automatically** build _only_ the packages required by a selected image configuration and then builds the image.
@@ -185,13 +185,13 @@ All images are generated in the `out/images` folder.
185185

186186
```bash
187187
# To build a Mariner VHD Image (VHD folder: ../out/images/core-legacy)
188-
sudo make image CONFIG_FILE=./imageconfigs/core-legacy.json REBUILD_TOOLS=y DOWNLOAD_SRPMS=y
188+
sudo make image CONFIG_FILE=./imageconfigs/core-legacy.json REBUILD_TOOLS=y SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
189189

190190
# To build a Mariner VHDX Image (VHDX folder ../out/images/core-efi)
191-
sudo make image CONFIG_FILE=./imageconfigs/core-efi.json REBUILD_TOOLS=y DOWNLOAD_SRPMS=y
191+
sudo make image CONFIG_FILE=./imageconfigs/core-efi.json REBUILD_TOOLS=y SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
192192

193193
# To build a Mariner Contianer Image (Container Folder: ../out/images/core-container/*.tar.gz
194-
sudo make image CONFIG_FILE=./imageconfigs/core-container.json REBUILD_TOOLS=y DOWNLOAD_SRPMS=y
194+
sudo make image CONFIG_FILE=./imageconfigs/core-container.json REBUILD_TOOLS=y SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core
195195
```
196196

197197
### ISO Images
@@ -306,7 +306,7 @@ sudo make image CA_CERT=/path/to/rootca.crt TLS_CERT=/path/to/user.crt TLS_KEY=/
306306

307307
## Building Everything From Scratch
308308

309-
**NOTE: Source files must be made available for all packages. They can be placed manually in the corresponding SPEC/\* folders, `SOURCE_URL=<YOUR_SOURCE_SERVER>` may be provided, or DOWNLOAD_SRPMS=y may be used to use pre-packages sources**
309+
**NOTE: Source files must be made available for all packages. They can be placed manually in the corresponding SPEC/\* folders, `SOURCE_URL=<YOUR_SOURCE_SERVER>` may be provided, or DOWNLOAD_SRPMS=y may be used to use pre-packages sources. Core Mariner source packages are available at `SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core`**
310310

311311
The build system can operate without using pre-built components if desired. There are several variables which enable/disable build components and sources of data. They are listed here along with their default values:
312312

@@ -370,7 +370,7 @@ If that is not desired all remote sources can be disabled by clearing the follow
370370

371371
#### `SOURCE_URL=...`
372372

373-
> URL to download unavailable source files from when creating `*.src.rpm` files prior to build.
373+
> URL to download unavailable source files from when creating `*.src.rpm` files prior to build. Only one URL can be set at a time; there is no support for a list of multiple source URLs.
374374
375375
#### `PACKAGE_URL_LIST=...`
376376

0 commit comments

Comments
 (0)