diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json index c1b02d48a79..3de6c3cdb3c 100644 --- a/.config/CredScanSuppressions.json +++ b/.config/CredScanSuppressions.json @@ -19,11 +19,11 @@ }, { "file": "\\toolkit\\docs\\quick_start\\quickstart.md", - "_justification": "Secrets for sample, non-production Mariner images." + "_justification": "Secrets for sample, non-production Azure Linux images." }, { "file": "\\toolkit\\imageconfigs\\read-only-root-efi.json", - "_justification": "Secret for a sample, non-production Mariner image." + "_justification": "Secret for a sample, non-production Azure Linux image." } ] } diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0eb10e3c88d..87386128ad1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,4 @@ -# By default, all files require a review by at least one member of the CBL-Mariner developers team. +# By default, all files require a review by at least one member of the Azure Linux developers team. # See teams here: https://github.com/orgs/microsoft/teams?query=mariner * @microsoft/cbl-mariner-devs @@ -70,10 +70,10 @@ # Modifications to the toolkit requires reviews from the toolkit team /toolkit/ @microsoft/cbl-mariner-tooling -# Docs to be reviewed by general CBL-Mariner devs +# Docs to be reviewed by general Azure Linux devs /toolkit/docs/ @microsoft/cbl-mariner-devs -# Default image configurations to be reviewed by general CBL-Mariner devs +# Default image configurations to be reviewed by general Azure Linux devs /toolkit/imageconfigs/ @microsoft/cbl-mariner-devs # Package and toolchain manifests to be reviewed by toolchain team diff --git a/.github/workflows/mariner-spec-cleaner.patch b/.github/workflows/azurelinux-spec-cleaner.patch old mode 100755 new mode 100644 similarity index 99% rename from .github/workflows/mariner-spec-cleaner.patch rename to .github/workflows/azurelinux-spec-cleaner.patch index 0f72cf0db95..ebbce2e56f5 --- a/.github/workflows/mariner-spec-cleaner.patch +++ b/.github/workflows/azurelinux-spec-cleaner.patch @@ -98,7 +98,7 @@ index 0000000..9577d23 + +steps: +- bash: | -+ git diff --diff-algorithm=minimal $(git rev-parse refs/tags/$(upstreamTag))..HEAD > $(Build.ArtifactStagingDirectory)/mariner-spec-cleaner.patch ++ git diff --diff-algorithm=minimal $(git rev-parse refs/tags/$(upstreamTag))..HEAD > $(Build.ArtifactStagingDirectory)/azurelinux-spec-cleaner.patch + +- task: PublishBuildArtifacts@1 + inputs: @@ -212,7 +212,7 @@ index e89d188..b4e231d 100644 -[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/rpm-software-management/spec-cleaner.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rpm-software-management/spec-cleaner/context:python) -[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit) -[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) -+spec-cleaner is a tool that cleans the given RPM spec file according to the Mariner style and returns the result. ++spec-cleaner is a tool that cleans the given RPM spec file according to the Azure Linux style and returns the result. - -spec-cleaner is a tool that cleans the given RPM spec file according to the style guide and returns the result. @@ -10682,11 +10682,11 @@ index c701543..326c724 100644 - """ parser = argparse.ArgumentParser( - prog='spec-cleaner', -+ prog='mariner-spec-cleaner', ++ prog='azurelinux-spec-cleaner', formatter_class=argparse.ArgumentDefaultsHelpFormatter, - description='Cleans the given spec file according to style guide and returns the result. If "#nospeccleaner"' - 'tag is used in the spec file than the spec file will not be cleaned.', -+ description='Cleans the given spec file according to the Mariner style guide and returns the result.' ++ description='Cleans the given spec file according to the Azure Linux style guide and returns the result.' + 'If "#nospeccleaner" tag is used in the spec file, then the spec file will not be cleaned.', ) @@ -11579,7 +11579,7 @@ index 9e2490c..64bfd8d 100644 'summary': self.reg.re_summary, # for url we have a special match - http -> https replacement + # for vendor, we force it to match "Microsoft" -+ # for distribution, we force it to match "Mariner" ++ # for distribution, we force it to match "Azure Linux" 'group': self.reg.re_group, 'nosource': self.reg.re_nosource, # for source, we have a special match to keep the source number @@ -11794,7 +11794,7 @@ index 9e2490c..64bfd8d 100644 + self._add_line_value_to('vendor', 'Microsoft Corporation', key='Vendor') + + elif self.reg.re_distribution.match(line): -+ self._add_line_value_to('distribution', 'Mariner', key='Distribution') ++ self._add_line_value_to('distribution', 'Azure Linux', key='Distribution') + elif self.reg.re_source.match(line): match = self.reg.re_source.match(line) @@ -21672,7 +21672,7 @@ index 54715dc..0000000 -NOTE: - -To make sure your perldoc/Pod viewing setup for viewing this page is --working: The six-letter word "résumé" should look like "resume" with an "/" +-working: The six-letter word "résumé" should look like "resume" with an "/" -accent on each "e". - -For further tests, and help if that doesn't work, see below, A POD ENCODING diff --git a/.github/workflows/lint-specs.yml b/.github/workflows/lint-specs.yml index 3ebd0b3ea9f..0e5bb6f4a88 100644 --- a/.github/workflows/lint-specs.yml +++ b/.github/workflows/lint-specs.yml @@ -51,7 +51,7 @@ jobs: path: 'main-checkout' # Our linter is based on the spec-cleaner tool from the folks at openSUSE - # We apply a patch to modify it for CBL-Mariner's needs + # We apply a patch to modify it for Azure Linux's needs - name: spec-cleaner checkout uses: actions/checkout@v4 with: @@ -59,7 +59,7 @@ jobs: ref: 'spec-cleaner-1.2.0' path: 'spec-cleaner' - # For consistency, we use the same major/minor version of Python that CBL-Mariner ships + # For consistency, we use the same major/minor version of Python that Azure Linux ships - name: Setup Python 3.7 uses: actions/setup-python@v4 with: @@ -67,10 +67,10 @@ jobs: # We take our version of the linting tool from the master branch to ensure rules # are consistent across all branches - - name: Patch spec-cleaner with Mariner-specific lints + - name: Patch spec-cleaner with Azure Linux-specific lints run: | pushd spec-cleaner - git apply ../main-checkout/.github/workflows/mariner-spec-cleaner.patch + git apply ../main-checkout/.github/workflows/azurelinux-spec-cleaner.patch popd - name: Install patched spec-cleaner diff --git a/.github/workflows/overwrite_shell_link.sh b/.github/workflows/overwrite_shell_link.sh index f454c107640..1c45a3cfb16 100755 --- a/.github/workflows/overwrite_shell_link.sh +++ b/.github/workflows/overwrite_shell_link.sh @@ -13,7 +13,7 @@ fi if [[ "$original_rpm_shell" != "bash" ]] then - echo "Host system's '$shell_link_path' links to '$original_rpm_shell'. Mariner specs require 'bash' - updating." + echo "Host system's '$shell_link_path' links to '$original_rpm_shell'. Azure Linux specs require 'bash' - updating." sudo rm -f $shell_link_path sudo ln -s bash "$shell_link_path" diff --git a/README.md b/README.md index 6677359d826..59fd961c3e5 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ Instructions for building Azure Linux may be found here: [Toolkit Documentation] You can try Azure Linux with the following ISO images: - [Mariner 2.0 x86_64 ISO](https://aka.ms/mariner-2.0-x86_64-iso). -- [Mariner 1.0 x86_64 ISO](https://aka.ms/mariner-1.0-x86_64-iso). Before using a downloaded ISO, [verify the checksum and signature of the image](toolkit/docs/security/iso-image-verification.md). @@ -33,7 +32,7 @@ Note: Support for the ISO is community based. Before filing a new bug or feature ## Getting Help - Bugs, feature requests and questions can be filed as GitHub issues. -- We are starting a public community call for Mariner users to get together and discuss new features, provide feedback, and learn more about how others are using Mariner. In each session, we will feature a new demo. The schedule for the upcoming community calls are: +- We are starting a public community call for Azure Linux users to get together and discuss new features, provide feedback, and learn more about how others are using Azure Linux. In each session, we will feature a new demo. The schedule for the upcoming community calls are: - 1/25/24 from 8-9am (PST) [Click to join](https://teams.microsoft.com/l/meetup-join/19%3ameeting_NGM1YWZiMDMtYWZkZi00NzBmLWExNjgtM2RkMjFmYTNiYmU2%40thread.v2/0?context=%7b%22Tid%22%3a%2272f988bf-86f1-41af-91ab-2d7cd011db47%22%2c%22Oid%22%3a%2230697089-15b8-4c68-b67e-7db9cd4f02ea%22%7d) - 3/28/24 from 8-9am (PST) [Click to join](https://teams.microsoft.com/l/meetup-join/19%3ameeting_NGM1YWZiMDMtYWZkZi00NzBmLWExNjgtM2RkMjFmYTNiYmU2%40thread.v2/0?context=%7b%22Tid%22%3a%2272f988bf-86f1-41af-91ab-2d7cd011db47%22%2c%22Oid%22%3a%2230697089-15b8-4c68-b67e-7db9cd4f02ea%22%7d) - 5/23/24 from 8-9am (PST) [Click to join](https://teams.microsoft.com/l/meetup-join/19%3ameeting_NGM1YWZiMDMtYWZkZi00NzBmLWExNjgtM2RkMjFmYTNiYmU2%40thread.v2/0?context=%7b%22Tid%22%3a%2272f988bf-86f1-41af-91ab-2d7cd011db47%22%2c%22Oid%22%3a%2230697089-15b8-4c68-b67e-7db9cd4f02ea%22%7d) diff --git a/SPECS-EXTENDED/cassandra/Readme b/SPECS-EXTENDED/cassandra/Readme index 043db8cd104..ddadb6c4f15 100644 --- a/SPECS-EXTENDED/cassandra/Readme +++ b/SPECS-EXTENDED/cassandra/Readme @@ -2,7 +2,7 @@ # apply pre-downloaded cassandra-build-cache which is # required for cassandra to build based on ant build.xml # Generate cassandra-build-cache when ever update to latest version. -1. Boot up Mariner Core 2.0 +1. Boot up Azure Linux Core 2. Refer to cassandra spec and install all build required dependenices. 3. Download cassandra sources and extract under /usr/src 4. cd /usr/src/apache-cassandra--src diff --git a/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec b/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec index 973384da154..036f2a2ef03 100644 --- a/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec +++ b/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec @@ -12,7 +12,7 @@ Summary: Signed GRand Unified Bootloader for %{buildarch} systems Name: grub2-efi-binary-signed-%{buildarch} Version: 2.06 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -77,6 +77,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname} /boot/efi/EFI/BOOT/%{grubpxeefiname} %changelog +* Wed Mar 07 2024 Mykhailo Bykhovtsev - 2.06-16 +- Bumping release version to match with `grub2` release version + * Tue Mar 05 2024 Cameron Baird - 2.06-15 - Bump release number to match grub release number diff --git a/SPECS/ca-certificates/ca-certificates.signatures.json b/SPECS/ca-certificates/ca-certificates.signatures.json index 3339468af6c..1ebe1fefa1e 100644 --- a/SPECS/ca-certificates/ca-certificates.signatures.json +++ b/SPECS/ca-certificates/ca-certificates.signatures.json @@ -10,7 +10,7 @@ "README.src": "86184318d451bec55d70c84e618cbfe10c8adb7dc893964ce4aaecff99d83433", "README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8", "bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a", - "certdata.base.txt": "5ce20c9e9542ebc1cc27a0a18de8bb37b91354d898462a18563aba372f646198", + "certdata.base.txt": "7622cbc7245e7a8a17c6b3dd448976748ea99d3c7d68f460ea835a59aab30e12", "certdata.microsoft.txt": "8eea04b31e73f9e64040a2d905b02f05dc4c6f2e9964919f5921a31c1ace0d02", "certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33", "pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426", diff --git a/SPECS/ca-certificates/ca-certificates.spec b/SPECS/ca-certificates/ca-certificates.spec index dd9401a8512..3938abc4bb4 100644 --- a/SPECS/ca-certificates/ca-certificates.spec +++ b/SPECS/ca-certificates/ca-certificates.spec @@ -45,7 +45,7 @@ Name: ca-certificates # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well. Epoch: 1 Version: 3.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MPLv2.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -324,6 +324,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem} %{_bindir}/bundle2pem.sh %changelog +* Wed Feb 28 2024 Mykhailo Bykhovtsev - 3.0.0-3 +- Updated certdata.base.txt to replace CBL-Mariner with Azure Linux + * Sat Jan 27 2024 CBL-Mariner Servicing Account - 3.0.0-3 - Updating Microsoft trusted root CAs. diff --git a/SPECS/ca-certificates/certdata.base.txt b/SPECS/ca-certificates/certdata.base.txt index e267a1cd15a..f7adb16d282 100644 --- a/SPECS/ca-certificates/certdata.base.txt +++ b/SPECS/ca-certificates/certdata.base.txt @@ -64,7 +64,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_BUILTIN_ROOT_LIST CKA_TOKEN CK_BBOOL CK_TRUE CKA_PRIVATE CK_BBOOL CK_FALSE CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CBL-Mariner Builtin Roots" +CKA_LABEL UTF8 "Azure Linux Builtin Roots" # # Certificate "Microsoft Azure TLS Issuing CA 01" diff --git a/SPECS/calamares/calamares.spec b/SPECS/calamares/calamares.spec index 53938c41a07..5fc10924fdc 100644 --- a/SPECS/calamares/calamares.spec +++ b/SPECS/calamares/calamares.spec @@ -7,7 +7,7 @@ Summary: Installer from a live CD/DVD/USB to disk # https://github.com/calamares/calamares/issues/1051 Name: calamares Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -221,6 +221,9 @@ install -p -m 644 %{SOURCE53} %{buildroot}%{_sysconfdir}/calamares/azl-eula %{_libdir}/libcalamaresui.so %changelog +* Thu Mar 07 2024 Mykhailo Bykhovtsev - 3.3.1-2 +- Updated reference to distro in patch file from "Mariner" to "Azure Linux" + * Tue Jan 16 2024 Sam Meluch - 3.3.1-1 - Upgrade to version 3.3.1 for Azure Linux 3.0 - Update patches to accomodate version 3.3.1 diff --git a/SPECS/calamares/round-to-full-disk-size.patch b/SPECS/calamares/round-to-full-disk-size.patch index e98331652f1..88b968b02af 100644 --- a/SPECS/calamares/round-to-full-disk-size.patch +++ b/SPECS/calamares/round-to-full-disk-size.patch @@ -5,7 +5,7 @@ diff -ru calamares-3.2.11-orig/src/modules/partition/jobs/CreatePartitionTableJo currentPartition[KeyFlags] = QJsonArray::fromStringList(PartitionTable::flagNames(PartitionInfo::flags(x))); currentPartition[KeyStart] = (x->firstByte() / MiBSize); -- // Since Mariner installer does not use the last MiB, +- // Since Azure Linux installer does not use the last MiB, - // we have to report additional 1MiB per partition end - currentPartition[KeyEnd] = x->lastByte() / MiBSize + 1; + // check if we're almost at capacity and set end to 0 in json (full size) @@ -16,7 +16,7 @@ diff -ru calamares-3.2.11-orig/src/modules/partition/jobs/CreatePartitionTableJo + } + else + { -+ // Since Mariner installer does not use the last MiB, ++ // Since Azure Linux installer does not use the last MiB, + // we have to report additional 1MiB per partition end + currentPartition[KeyEnd] = x->lastByte() / MiBSize + 1; + } diff --git a/SPECS/emacs/CVE-2007-6109.nopatch b/SPECS/emacs/CVE-2007-6109.nopatch index 431732f242f..41376eadca5 100644 --- a/SPECS/emacs/CVE-2007-6109.nopatch +++ b/SPECS/emacs/CVE-2007-6109.nopatch @@ -4,7 +4,7 @@ The CVE is from 2007, the affected versions for it are below 22.1-r3as: - Vulnerable versions: <22.1-r3 - Unaffected versions: >=22.1-r3, revision >=21.4-r14, <19 -Mariner’s main branch uses version 28.1 +Azure Linux's main branch uses version 28.1 Reference: https://nvd.nist.gov/vuln/detail/CVE-2007-6109 diff --git a/SPECS/grub2/grub2.signatures.json b/SPECS/grub2/grub2.signatures.json index 09f7cf7435a..4dffe163683 100644 --- a/SPECS/grub2/grub2.signatures.json +++ b/SPECS/grub2/grub2.signatures.json @@ -3,6 +3,6 @@ "gnulib-d271f868a8df9bbec29049d01e056481b7a1a263.tar.gz": "4e23415ae2977ffca15e07419ceff3e9334d0369eafc9e7ae2578f8dd9a4839c", "grub-2.06.tar.gz": "660eaa2355a4045d8d0cdb5765169d1cad9912ec07873b86c9c6d55dbaa9dfca", "macros.grub2": "b03f6f713601214406971de53538dfc25136bf836f09a663eaffc4332a72c38b", - "sbat.csv.in": "11106562bccc09244f573be85ba2fe07cd1c830ef5bf3cc5e83a194c717880a5" + "sbat.csv.in": "0d06d0ae6064e0e01410281aa88050bf671dc23f7c490fbf1b56619c4d122e87" } } diff --git a/SPECS/grub2/grub2.spec b/SPECS/grub2/grub2.spec index 846f9089b17..753e998dde0 100644 --- a/SPECS/grub2/grub2.spec +++ b/SPECS/grub2/grub2.spec @@ -6,7 +6,7 @@ Summary: GRand Unified Bootloader Name: grub2 Version: 2.06 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -388,6 +388,9 @@ cp $GRUB_PXE_MODULE_SOURCE $EFI_BOOT_DIR/$GRUB_PXE_MODULE_NAME %config(noreplace) %{_sysconfdir}/grub.d/41_custom %changelog +* Wed Mar 07 2024 Mykhailo Bykhovtsev - 2.06-16 +- Updated sbat.csv.in to reflect new distro name. + * Tue Mar 05 2024 Cameron Baird - 2.06-15 - Explicitly depend on systemd-udev for image install diff --git a/SPECS/grub2/sbat.csv.in b/SPECS/grub2/sbat.csv.in index a9979261ba7..2ef306b87c6 100644 --- a/SPECS/grub2/sbat.csv.in +++ b/SPECS/grub2/sbat.csv.in @@ -1,3 +1,3 @@ sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md grub,2,Free Software Foundation,grub,@@VERSION@@,https://www.gnu.org/software/grub/ -grub.mariner,2,Microsoft,grub2,@@VERSION_RELEASE@@,https://github.com/microsoft/CBL-Mariner +grub.azurelinux,2,Microsoft,grub2,@@VERSION_RELEASE@@,https://github.com/microsoft/azurelinux diff --git a/SPECS/iputils/ping_test_ipv6_localhost.patch b/SPECS/iputils/ping_test_ipv6_localhost.patch index 76aa81c8b62..a857688c6c7 100644 --- a/SPECS/iputils/ping_test_ipv6_localhost.patch +++ b/SPECS/iputils/ping_test_ipv6_localhost.patch @@ -3,7 +3,7 @@ From: Rachel Menge Date: Fri, 18 Feb 2022 12:13:21 -0800 Subject: [PATCH] Mark ping6 for localhost as expected failure -Mariner does not map 'localhost' for ipv6 addresses +Azure Linux does not map 'localhost' for ipv6 addresses --- test/ping/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/librsync/librsync.spec b/SPECS/librsync/librsync.spec index eff293412a2..3cf231aa7df 100644 --- a/SPECS/librsync/librsync.spec +++ b/SPECS/librsync/librsync.spec @@ -63,7 +63,7 @@ make DESTDIR=%{buildroot} install %if 0%{?with_check} # install outside of DESTDIR to resolve test error: -# /usr/src/mariner/BUILD/librsync-2.0.2/build/rdiff: error while loading shared libraries: librsync.so.2: cannot open shared object file: No such file or directory +# /usr/src/azl/BUILD/librsync-2.0.2/build/rdiff: error while loading shared libraries: librsync.so.2: cannot open shared object file: No such file or directory make install %endif diff --git a/SPECS/maven/maven_build_caches.sh b/SPECS/maven/maven_build_caches.sh index 11b8ae8401f..b81aa7a3185 100644 --- a/SPECS/maven/maven_build_caches.sh +++ b/SPECS/maven/maven_build_caches.sh @@ -1,6 +1,6 @@ #!/bin/bash ## Helper script to generate maven build caches. -## CBL-MARINER builds do not have access to internet when building rpms. +## Azure Linux builds do not have access to internet when building rpms. ## Generating build cache as tarballs to be used when buidling offline. set -e diff --git a/SPECS/ostree/0003-ostree-converting-osname-to-mariner.patch b/SPECS/ostree/0003-ostree-converting-osname-to-azurelinux.patch similarity index 95% rename from SPECS/ostree/0003-ostree-converting-osname-to-mariner.patch rename to SPECS/ostree/0003-ostree-converting-osname-to-azurelinux.patch index 14689726784..e225933955e 100644 --- a/SPECS/ostree/0003-ostree-converting-osname-to-mariner.patch +++ b/SPECS/ostree/0003-ostree-converting-osname-to-azurelinux.patch @@ -26,7 +26,7 @@ index 976c4b5..263e2f5 100644 } - /* Copying Photon Specific config files to sutiable location */ -+ /* Copying Mariner Specific config files to sutiable location */ ++ /* Copying distribution Specific config files to sutiable location */ if (kernel_layout->kernelcfg_srcpath) { if (!glnx_fstatat_allow_noent (bootcsum_dfd, kernel_layout->kernelcfg_namever, &stbuf, 0, error)) diff --git a/SPECS/ostree/ostree.spec b/SPECS/ostree/ostree.spec index 6edcf76a4cf..aabbbaa66d0 100644 --- a/SPECS/ostree/ostree.spec +++ b/SPECS/ostree/ostree.spec @@ -1,7 +1,7 @@ Summary: Git for operating system binaries Name: ostree Version: 2022.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Vendor: Microsoft Corporation Distribution: Azure Linux @@ -12,7 +12,7 @@ Source1: 91-ostree.preset Patch0: dualboot-support.patch Patch1: 0001-ostree-Copying-photon-config-to-boot-directory.patch Patch2: 0002-ostree-Adding-load-env-to-menuentry.patch -Patch3: 0003-ostree-converting-osname-to-mariner.patch +Patch3: 0003-ostree-converting-osname-to-azurelinux.patch BuildRequires: attr-devel BuildRequires: autoconf BuildRequires: automake @@ -155,6 +155,9 @@ install -vdm 755 %{buildroot}%{_sysconfdir}/ostree/remotes.d %{_libexecdir}/libostree/grub2* %changelog +* Thu Mar 07 2024 Mykhailo Bykhovtsev - 2022.1-4 +- Renamed "0003-ostree-converting-osname-to-mariner.patch" to "0003-ostree-converting-osname-to-azurelinux.patch" + * Wed Sep 20 2023 Jon Slobodzian - 2022.1-3 - Recompile with stack-protection fixed gcc version (CVE-2023-4039) diff --git a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec index 60c32d632e8..f1d5d2344e4 100644 --- a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec +++ b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec @@ -3,7 +3,7 @@ Name: prebuilt-ca-certificates-base # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well. Epoch: 1 Version: 3.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -46,6 +46,9 @@ find %{buildroot} -name README -delete %{_sysconfdir}/pki/java/cacerts %changelog +* Wed Feb 28 2024 Mykhailo Bykhovtsev - 3.0.0-4 +- Bumping release version to match with 'ca-certificates' + * Sat Jan 27 2024 CBL-Mariner Servicing Account - 3.0.0-3 - Making 'Release' match with 'ca-certificates' diff --git a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec index 08efbcf15d8..98151229ce3 100644 --- a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec +++ b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec @@ -3,7 +3,7 @@ Name: prebuilt-ca-certificates # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well. Epoch: 1 Version: 3.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -49,6 +49,9 @@ find %{buildroot} -name README -delete %{_sysconfdir}/pki/java/cacerts %changelog +* Wed Feb 28 2024 Mykhailo Bykhovtsev - 3.0.0-4 +- Bumping release version to match with 'ca-certificates' + * Sat Jan 27 2024 CBL-Mariner Servicing Account - 3.0.0-3 - Making 'Release' match with 'ca-certificates' diff --git a/SPECS/python-toml/python-toml.spec b/SPECS/python-toml/python-toml.spec index f8fbb10a915..f891fd9670a 100644 --- a/SPECS/python-toml/python-toml.spec +++ b/SPECS/python-toml/python-toml.spec @@ -15,7 +15,7 @@ or tomli/tomli-w. Name: python-%{pypi_name} Version: 0.10.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A deprecated Python Library for Tom's Obvious, Minimal Language License: MIT diff --git a/SPECS/rabbitmq-server/executeRabbitMQTests.sh b/SPECS/rabbitmq-server/executeRabbitMQTests.sh index aceb1bd5e59..47b545fb64f 100755 --- a/SPECS/rabbitmq-server/executeRabbitMQTests.sh +++ b/SPECS/rabbitmq-server/executeRabbitMQTests.sh @@ -1,7 +1,7 @@ #!/bin/bash #### TESTING DISCLAIMER #### -# This script follows the steps to run the tests for RabbitMQ v3.11.9 as of 2/22/23 on CBL-Mariner. As a result, this script can likely +# This script follows the steps to run the tests for RabbitMQ v3.11.9 as of 2/22/23 on Azure Linux. As a result, this script can likely # be used as a baseline to execute the test for future releases/upgrades to verify the package integrity. That said, some things may need # to be updated in order to make the tests succeed such as updating the links for erlang, elixir, bazel, and/or mandoc in order to have # some or all tests succeed. @@ -17,7 +17,7 @@ # # RabbitMQ depends on bazel 'latest'. As of 2/22/23, the latest bazel version is '6.0.0'. # -# Some tests also rely on the 'mandoc' package. As of 2/22/23, this package was not available in Mariner. As a result, the package is +# Some tests also rely on the 'mandoc' package. As of 2/22/23, this package was not available in Azure Linux. As a result, the package is # pulled from source and installed. These test break the entire run, so this dependency must be pulled in for the entire suite to succeed. # # The elixir package relies on having the UTF-8 character encoding set in your locale in order to function properly. Because of this, you diff --git a/SPECS/rabbitmq-server/rabbitmqHexCacheMakefile b/SPECS/rabbitmq-server/rabbitmqHexCacheMakefile index f651fdb8783..8ecddffab15 100755 --- a/SPECS/rabbitmq-server/rabbitmqHexCacheMakefile +++ b/SPECS/rabbitmq-server/rabbitmqHexCacheMakefile @@ -63,7 +63,7 @@ generate-hex-cache: generate-time-file # field) and `ets:tab2file()` produces a different file each time it's # called. # -# For Mariner, we fix the time of the `last_update` field to the time of +# For Azure Linux, we fix the time of the `last_update` field to the time of # creation for the hex-cache.ets and dump the content of the # table as an Erlang term to a text file. # diff --git a/SPECS/reaper/Readme b/SPECS/reaper/Readme index eb5e6ae2400..e80077e651a 100755 --- a/SPECS/reaper/Readme +++ b/SPECS/reaper/Readme @@ -9,7 +9,7 @@ # d. /usr/local - Current nodejs/npm versions cause build to fail due to incompatible node-sass/node-gyp version dependencies added in reaper's sources - package.json. This requires downgraded nodejs version of 14.18.0 and corresponding npm v6 that needs to be installed. # e. /src/ui/bower_components - bower artifacts built in sources directory # f. /src/ui/node_modules - npm-install related modeuls built in sources directory -1. Boot up Mariner Core 2.0 +1. Boot up Azure Linux Core 2. Refer to reaper spec and install all build required dependenices. 3. Download reaper sources and extract under /usr/src 4. cd /usr/src/cassandra-reaper- diff --git a/SPECS/reaper/reaper_build_caches.sh b/SPECS/reaper/reaper_build_caches.sh index b1d7ea5fbba..7a31e97ca18 100755 --- a/SPECS/reaper/reaper_build_caches.sh +++ b/SPECS/reaper/reaper_build_caches.sh @@ -65,7 +65,7 @@ function installNodeModules { echo "Installing node modules." sudo tdnf install -y nodejs npm config set cache "$homeCacheDir/.npm" --global - # Default node/npm versions in Mariner fails to build dependency node module versions due to known + # Default node/npm versions in Azure Linux fails to build dependency node module versions due to known # incompatibilities. # Backward compatible with node@v14.18.0 # When installing modules via npm to default prefix='/usr/local' in mariner, the permissions for 'others' diff --git a/SPECS/shim-unsigned-aarch64/sbat.csv.in b/SPECS/shim-unsigned-aarch64/sbat.csv.in index 9759dab89c5..6a1ccc00c8c 100644 --- a/SPECS/shim-unsigned-aarch64/sbat.csv.in +++ b/SPECS/shim-unsigned-aarch64/sbat.csv.in @@ -1 +1 @@ -shim.mariner,1,Microsoft,shim,@@VERSION_RELEASE@@,https://github.com/microsoft/CBL-Mariner +shim.azurelinux,1,Microsoft,shim,@@VERSION_RELEASE@@,https://github.com/microsoft/azurelinux diff --git a/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.signatures.json b/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.signatures.json index f6515ab2508..34c217fb48b 100644 --- a/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.signatures.json +++ b/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "cbl-mariner-ca-20210127.der": "34f7436bc56c7b4e526e55dbc207ad6311dbace0403e1d462ad1f9ce3479d386", - "sbat.csv.in": "a218d091e73ee91fc1dd5e99d391cc6c5cb660a34b70444b5c861b0eac52d2fd", + "sbat.csv.in": "895ecdff532c9ed1cfbcd1e4d8fd9b29b87628394cc9c9101ec5be47f66e504d", "shim-15.4.tar.bz2": "8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297" } } diff --git a/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.spec b/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.spec index b0454f70272..508856eae0d 100644 --- a/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.spec +++ b/SPECS/shim-unsigned-aarch64/shim-unsigned-aarch64.spec @@ -2,7 +2,7 @@ Summary: First stage UEFI bootloader Name: shim-unsigned-aarch64 Version: 15.4 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Vendor: Microsoft Corporation Distribution: Azure Linux @@ -44,6 +44,9 @@ make VENDOR_CERT_FILE=cert.der test %{_datadir}/%{name}/shimaa64.efi %changelog +* Thu Mar 07 2024 Mykhailo Bykhovtsev - 15.4-2 +- Updated sbat.csv.in to reflect new distro name. + * Tue Mar 30 2021 Chris Co - 15.4-1 - Update to 15.4 - Remove extra patches. These are incorporated into latest version diff --git a/SPECS/shim-unsigned-x64/sbat.csv.in b/SPECS/shim-unsigned-x64/sbat.csv.in index 9759dab89c5..6a1ccc00c8c 100644 --- a/SPECS/shim-unsigned-x64/sbat.csv.in +++ b/SPECS/shim-unsigned-x64/sbat.csv.in @@ -1 +1 @@ -shim.mariner,1,Microsoft,shim,@@VERSION_RELEASE@@,https://github.com/microsoft/CBL-Mariner +shim.azurelinux,1,Microsoft,shim,@@VERSION_RELEASE@@,https://github.com/microsoft/azurelinux diff --git a/SPECS/shim-unsigned-x64/shim-unsigned-x64.signatures.json b/SPECS/shim-unsigned-x64/shim-unsigned-x64.signatures.json index cd3384d2784..7f1ead909a2 100644 --- a/SPECS/shim-unsigned-x64/shim-unsigned-x64.signatures.json +++ b/SPECS/shim-unsigned-x64/shim-unsigned-x64.signatures.json @@ -1,7 +1,7 @@ { "Signatures": { "cbl-mariner-ca-20211013.der": "35478a4e9d9f5b8b04d417c4e2dbdfb32b6637a9d0293073aaafcdee8b506537", - "sbat.csv.in": "a218d091e73ee91fc1dd5e99d391cc6c5cb660a34b70444b5c861b0eac52d2fd", + "sbat.csv.in": "895ecdff532c9ed1cfbcd1e4d8fd9b29b87628394cc9c9101ec5be47f66e504d", "shim-15.4.tar.bz2": "8344473dd10569588b8238a4656b8fab226714eea9f5363f8c410aa8a5090297" } } diff --git a/SPECS/shim-unsigned-x64/shim-unsigned-x64.spec b/SPECS/shim-unsigned-x64/shim-unsigned-x64.spec index a5392eb223d..0dfc42b98e0 100644 --- a/SPECS/shim-unsigned-x64/shim-unsigned-x64.spec +++ b/SPECS/shim-unsigned-x64/shim-unsigned-x64.spec @@ -2,7 +2,7 @@ Summary: First stage UEFI bootloader Name: shim-unsigned-x64 Version: 15.4 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Vendor: Microsoft Corporation Distribution: Azure Linux @@ -50,6 +50,9 @@ make VENDOR_CERT_FILE=cert.der test %{_datadir}/%{name}/shimx64.efi %changelog +* Thu Mar 07 2024 Mykhailo Bykhovtsev - 15.4-3 +- Updated sbat.csv.in to reflect new distro name. + * Wed Jan 05 2022 Chris Co - 15.4-2 - Update key - License verified diff --git a/toolkit/README.md b/toolkit/README.md index c630a4b5912..2b2e3a8cac7 100644 --- a/toolkit/README.md +++ b/toolkit/README.md @@ -3,7 +3,7 @@ - **Recommended if you want to try Azure Linux.** - Quickly build the **Standard Azure Linux** image, install and use. -## [Tutorial for Building Custom Mariner Based Images](https://github.com/microsoft/azurelinux-tutorials) +## [Tutorial for Building Custom Azure Linux Based Images](https://github.com/microsoft/azurelinux-tutorials) - **Recommended if you are a developer and want to experiment with Azure Linux.** - Quickly build a **Custom Azure Linux** image, install and use. diff --git a/toolkit/docs/building/building.md b/toolkit/docs/building/building.md index 1c23184de3c..4e9182e8818 100644 --- a/toolkit/docs/building/building.md +++ b/toolkit/docs/building/building.md @@ -83,7 +83,7 @@ ## Overview -The following documentation describes how to fully build Azure Linux end-to-end as well as advanced techniques for performing toolchain, or package builds. Full builds of CBL-Mariner _**is not**_ generally needed. All Azure Linux packages are built signed and released to an RPM repository at [packages.microsoft.com](https://packages.microsoft.com/azurelinux/3.0/prod/) +The following documentation describes how to fully build Azure Linux end-to-end as well as advanced techniques for performing toolchain, or package builds. Full builds of Azure Linux _**is not**_ generally needed. All Azure Linux packages are built signed and released to an RPM repository at [packages.microsoft.com](https://packages.microsoft.com/azurelinux/3.0/prod/) If you simply want to test-drive Azure Linux you may download and install the ISO (see: [readme.md](../../README.md)). If you want to experiment with Azure Linux and build custom images or add packages in a more focused environment, refer to the tutorial in the [AzureLinux-Tutorials](https://github.com/microsoft/AzureLinux-Tutorials) repository. @@ -214,13 +214,13 @@ All images are generated in the `out/images` folder. ### Virtual Hard Disks and Containers ```bash -# To build a Mariner VHD Image (VHD folder: ../out/images/core-legacy) +# To build an Azure Linux VHD Image (VHD folder: ../out/images/core-legacy) sudo make image CONFIG_FILE=./imageconfigs/core-legacy.json REBUILD_TOOLS=y -# To build a Mariner VHDX Image (VHDX folder ../out/images/core-efi) +# To build an Azure Linux VHDX Image (VHDX folder ../out/images/core-efi) sudo make image CONFIG_FILE=./imageconfigs/core-efi.json REBUILD_TOOLS=y -# To build a core Mariner Contianer (Container Folder: ../out/images/core-container/*.tar.gz +# To build a core Azure Linux Container (Container Folder: ../out/images/core-container/*.tar.gz sudo make image CONFIG_FILE=./imageconfigs/core-container.json REBUILD_TOOLS=y ``` @@ -301,7 +301,7 @@ sudo make input-srpms SRPM_FILE_SIGNATURE_HANDLING=update ### packages.microsoft.com Repository Structure -CBL-Mariner packages are available on [packages.microsoft.com](https://packages.microsoft.com/azurelinux/). The Azure Linux repositories are divided into major release folders (e.g.: 3.0). Each top level folder is subdivided into "preview" and "production" (prod) repositories. +Azure Linux packages are available on [packages.microsoft.com](https://packages.microsoft.com/azurelinux/). The Azure Linux repositories are divided into major release folders (e.g.: 3.0). Each top level folder is subdivided into "preview" and "production" (prod) repositories. The "preview" and "production" folders are further subdivided into purpose, and then again for architecture. This includes locations for source-rpms. @@ -363,7 +363,7 @@ sudo make image CONFIG_FILE="./imageconfigs/core-efi.json" CA_CERT=/path/to/root ## Building Everything From Scratch -**NOTE: Source files must be made available for all packages. They can be placed manually in the corresponding SPEC/\* folders, `SOURCE_URL=` 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`** +**NOTE: Source files must be made available for all packages. They can be placed manually in the corresponding SPEC/\* folders, `SOURCE_URL=` may be provided, or DOWNLOAD_SRPMS=y may be used to use pre-packages sources. Core Azure Linux source packages are available at `SOURCE_URL=https://cblmarinerstorage.blob.core.windows.net/sources/core`** 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: diff --git a/toolkit/docs/building/developer-tools.md b/toolkit/docs/building/developer-tools.md index b5bfca57b0a..b9314464326 100644 --- a/toolkit/docs/building/developer-tools.md +++ b/toolkit/docs/building/developer-tools.md @@ -3,9 +3,9 @@ ## containerized-rpmbuild -This [tool](./../../scripts/containerized-build/) enables the user to build/test a single Mariner package. It creates a Mariner container, either using the worker chroot as the fs or using upstream Mariner container (depending on the mode), and mounts SPECs, INTERMEDIATE_SRPMS, and out/RPMs from Mariner repository at repo_path (or the current Mariner repo) into the container. The user can choose whether to use locally built RPMs or upstream RPMs to satisfy build and runtime dependencies. One can use native rpm commands to build packages. Changes made to SPECS/ are synced to the host. All other changes are lost. +This [tool](./../../scripts/containerized-build/) enables the user to build/test a single Azure Linux package. It creates an Azure Linux container, either using the worker chroot as the fs or using upstream Azure Linux container (depending on the mode), and mounts SPECs, INTERMEDIATE_SRPMS, and out/RPMs from Azure Linux repository at repo_path (or the current Azure Linux repo) into the container. The user can choose whether to use locally built RPMs or upstream RPMs to satisfy build and runtime dependencies. One can use native rpm commands to build packages. Changes made to SPECS/ are synced to the host. All other changes are lost. -The user can optionally add arguments. REPO_PATH defines directory to use as Mariner repo, default is current directory. MODE can be build (default) or test. Mariner VERSION may be 2.0 (default) or 1.0. MOUNTS specify directories to mount into the container, besides the default ones. BUILD_MOUNT defines directory to mount as build directory into container, default is $REPO_PATH/build. EXTRA_PACKAGES to install into container besides the default ones. ENABLE_REPO to use local RPMs to satisfy build depenedencies. KEEP_CONTAINER to keep container on exit. By default, it is cleaned up upon exit. In addition, user may override any Mariner make definitions e.g. SPECS_DIR, SRPM_PACK_LIST, etc. +The user can optionally add arguments. REPO_PATH defines directory to use as Azure Linux repo, default is current directory. MODE can be build (default) or test. Azure Linux VERSION may be 2.0 (default) or 1.0. MOUNTS specify directories to mount into the container, besides the default ones. BUILD_MOUNT defines directory to mount as build directory into container, default is $REPO_PATH/build. EXTRA_PACKAGES to install into container besides the default ones. ENABLE_REPO to use local RPMs to satisfy build depenedencies. KEEP_CONTAINER to keep container on exit. By default, it is cleaned up upon exit. In addition, user may override any Azure Linux make definitions e.g. SPECS_DIR, SRPM_PACK_LIST, etc. ```bash cd azurelinux/toolkit diff --git a/toolkit/docs/building/prerequisites-mariner.md b/toolkit/docs/building/prerequisites-mariner.md index 20ebe0f98f6..2bbbe9dce8a 100644 --- a/toolkit/docs/building/prerequisites-mariner.md +++ b/toolkit/docs/building/prerequisites-mariner.md @@ -1,9 +1,9 @@ -# Build Requirements on `Mariner` +# Build Requirements on `Azure Linux` -## Requirements were validated on `Mariner 2.0` +## Requirements were validated on `Azure Linux` -This page lists host machine requirements for building with the Azure Linux toolkit. They cover building the toolchain, packages, and images on a Mariner host. +This page lists host machine requirements for building with the Azure Linux toolkit. They cover building the toolchain, packages, and images on an Azure Linux host. ```bash # Install required dependencies. diff --git a/toolkit/docs/formats/imageconfig.md b/toolkit/docs/formats/imageconfig.md index 7f9901b26b5..8bd8d20d292 100644 --- a/toolkit/docs/formats/imageconfig.md +++ b/toolkit/docs/formats/imageconfig.md @@ -6,7 +6,7 @@ Image configuration consists of two sections - Disks and SystemConfigs - that de Disks entry specifies the disk configuration like its size (for virtual disks), partitions and partition table. ## TargetDisk -Required when building unattended ISO installer. This field defines the physical disk to which Mariner should be installed. The `Type` field must be set to `path` and the `Value` field must be set to the desired target disk path. +Required when building unattended ISO installer. This field defines the physical disk to which Azure Linux should be installed. The `Type` field must be set to `path` and the `Value` field must be set to the desired target disk path. ### Artifacts Artifact (non-ISO image building only) defines the name, type and optional compression of the output Azure Linux image. @@ -216,11 +216,11 @@ All scripts follow the same format in the image config .json file: #### PreInstallScripts -There are customer requests that would like to use a Kickstart file to install Mariner OS. Kickstart installation normally includes pre-install scripts that run before installation begins and are normally used to handle tasks like network configuration, determining partition schema etc. The `PreInstallScripts` field allows for running customs scripts for similar purposes. Sample Kickstart pre-install script [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/installation_guide/s1-kickstart2-preinstallconfig). You must set the `IsKickStartBoot` to true in order to make the installer execute the preinstall scripts. +There are customer requests that would like to use a Kickstart file to install Azure Linux OS. Kickstart installation normally includes pre-install scripts that run before installation begins and are normally used to handle tasks like network configuration, determining partition schema etc. The `PreInstallScripts` field allows for running customs scripts for similar purposes. Sample Kickstart pre-install script [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/5/html/installation_guide/s1-kickstart2-preinstallconfig). You must set the `IsKickStartBoot` to true in order to make the installer execute the preinstall scripts. The preinstall scripts are run from the context of the installer, NOT the installed system (since it doesn't exist yet). -**NOTE**: currently, Mariner's pre-install scripts are mostly intended to provide support for partitioning schema configuration. For this purpose, make sure the script creates a proper configuration file (example [here](https://www.golinuxhub.com/2018/05/sample-kickstart-partition-example-raid/)) under `/tmp/part-include` in order for it to be consumed by Mariner's image building tools. +**NOTE**: currently, Azure Linux's pre-install scripts are mostly intended to provide support for partitioning schema configuration. For this purpose, make sure the script creates a proper configuration file (example [here](https://www.golinuxhub.com/2018/05/sample-kickstart-partition-example-raid/)) under `/tmp/part-include` in order for it to be consumed by Azure Linux's image building tools. #### PostInstallScripts @@ -272,7 +272,7 @@ Fields: ### Networks -The `Networks` entry is added to enable the users to specify the network configuration parameters to enable users to set IP address, configure the hostname, DNS etc. Currently, the Mariner tooling only supports a subset of the kickstart network command options: `bootproto`, `gateway`, `ip`, `net mask`, `DNS` and `device`. Hostname can be configured using the `Hostname` entry of the image config. +The `Networks` entry is added to enable the users to specify the network configuration parameters to enable users to set IP address, configure the hostname, DNS etc. Currently, the Azure Linux tooling only supports a subset of the kickstart network command options: `bootproto`, `gateway`, `ip`, `net mask`, `DNS` and `device`. Hostname can be configured using the `Hostname` entry of the image config. A sample Networks entry pointing to one network configuration: ``` json @@ -413,8 +413,8 @@ which is a higher precedent than the config file. This ensures SELinux boots in An optional field to overwrite the SELinux policy package name. If not set, the default is `selinux-policy`. #### CGroup -The version for CGroup in Mariner images can be enabled by using the `CGroup` key with value containing which version to use on boot. The value that can be chosen is either `version_one` or `version_two`. -The `version_two` value will set the cgroupv2 to be used in Mariner by setting the config value `systemd.unified_cgroup_hierarchy=1` in the default kernel command line. The value `version_one` or no value set will keep cgroupv1 (current default) to be enabled on boot. +The version for CGroup in Azure Linux images can be enabled by using the `CGroup` key with value containing which version to use on boot. The value that can be chosen is either `version_one` or `version_two`. +The `version_two` value will set the cgroupv2 to be used in Azure Linux by setting the config value `systemd.unified_cgroup_hierarchy=1` in the default kernel command line. The value `version_one` or no value set will keep cgroupv1 (current default) to be enabled on boot. For more information about cgroups with Kubernetes, see [About cgroupv2](https://kubernetes.io/docs/concepts/architecture/cgroups/). A sample KernelCommandLine enabling a basic IMA mode and passing two additional parameters: diff --git a/toolkit/docs/how_it_works/0_intro.md b/toolkit/docs/how_it_works/0_intro.md index 5aee1f8d8e9..445c1cade2d 100644 --- a/toolkit/docs/how_it_works/0_intro.md +++ b/toolkit/docs/how_it_works/0_intro.md @@ -4,7 +4,7 @@ ## General Build Flow -This section is intended to give an overview of Mariner's build process and toolkit. The diagrams below follow conventions stated in the key. +This section is intended to give an overview of Azure Linux's build process and toolkit. The diagrams below follow conventions stated in the key. ```mermaid --- @@ -30,7 +30,7 @@ flowchart TD ### High-level RPM flow -Mariner is an RPM based distro. A single package (or RPM) is built using a combination of sources and a spec file. A signature file is used to verify the sources' hashes. +Azure Linux is an RPM based distro. A single package (or RPM) is built using a combination of sources and a spec file. A signature file is used to verify the sources' hashes. ```mermaid flowchart LR @@ -66,7 +66,7 @@ flowchart LR ### High-level build flow - The build process can be split into three components: tooling, package generation, and image generation. When building, `make` options can be used to build Mariner from end to end or to download prebuilt artifacts. + The build process can be split into three components: tooling, package generation, and image generation. When building, `make` options can be used to build Azure Linux from end to end or to download prebuilt artifacts. ```mermaid flowchart LR diff --git a/toolkit/docs/how_it_works/1_initial_prep.md b/toolkit/docs/how_it_works/1_initial_prep.md index fd22d63f2ef..bb48290be2d 100644 --- a/toolkit/docs/how_it_works/1_initial_prep.md +++ b/toolkit/docs/how_it_works/1_initial_prep.md @@ -45,7 +45,7 @@ If the `TOOLCHAIN_ARCHIVE` variable is not set, but `REBUILD_TOOLCHAIN=y` is, th The chroot worker is an archive containing all the toolchain RPMs installed into a chroot environment. This archive can be extracted into a folder, then a chroot call can be made to switch into the environment. Once in the chroot environment only the RPM based tools and filesystem are available. This creates a clean build environment. The chroot worker is used at several points to perform various tasks using the RPM packaged tools without interfering with the host system. The three major ones are: -1) Processing spec files using Mariner's RPM macros. +1) Processing spec files using Azure Linux's RPM macros. 2) Using `tdnf` to download packages. 3) Building new packages using only the RPM based compilers/tools etc. diff --git a/toolkit/docs/how_it_works/5_misc.md b/toolkit/docs/how_it_works/5_misc.md index cdee9b7919a..ec99ac6a907 100644 --- a/toolkit/docs/how_it_works/5_misc.md +++ b/toolkit/docs/how_it_works/5_misc.md @@ -152,7 +152,7 @@ When Make is running with `--dry-run` or `-n` it will add the short-form flag `- ## Distroless images ### RPM manifest file -Mariner distroless container images do not contain an RPM database. In order for Secure Composition Analysis tools to detect the contents of a Mariner distroless container image, the file `/var/lib/rpmmanifest/container-manifest-2` contains the output of the following command: +Azure Linux distroless container images do not contain an RPM database. In order for Secure Composition Analysis tools to detect the contents of an Azure Linux distroless container image, the file `/var/lib/rpmmanifest/container-manifest-2` contains the output of the following command: ```bash rpm --query --all --query-format "%{NAME}\t%{VERSION}-%{RELEASE}\t%{INSTALLTIME}\t%{BUILDTIME}\t%{VENDOR}\t%{EPOCH}\t%{SIZE}\t%{ARCH}\t%{EPOCHNUM}\t%{SOURCERPM}\n" diff --git a/toolkit/docs/nvidia/nvidia.md b/toolkit/docs/nvidia/nvidia.md index 6be0bf6ac11..e6df75a0527 100644 --- a/toolkit/docs/nvidia/nvidia.md +++ b/toolkit/docs/nvidia/nvidia.md @@ -15,5 +15,5 @@ The following instructions register the nvidia package store with the package ma cd /etc/yum.repos.d # Copy the configuration to your directory to register the NVIDIA RPM repository with your package manager -sudo wget https://raw.githubusercontent.com/microsoft/CBL-Mariner/2.0/toolkit/docs/nvidia/mariner-nvidia.repo +sudo wget https://raw.githubusercontent.com/microsoft/Azure Linux/2.0/toolkit/docs/nvidia/mariner-nvidia.repo ``` diff --git a/toolkit/docs/quick_start/quickstart.md b/toolkit/docs/quick_start/quickstart.md index ba283006561..a92d73d0812 100644 --- a/toolkit/docs/quick_start/quickstart.md +++ b/toolkit/docs/quick_start/quickstart.md @@ -25,7 +25,7 @@ git checkout 2.0-stable ### **VHDX and VHD images** -The following builds a bootable, VHDX or VHD CBL-Mariner image from precompiled RPMs in the Azure Linux package repository at https://packages.microsoft.com/azurelinux/3.0/prod/. +The following builds a bootable, VHDX or VHD Azure Linux image from precompiled RPMs in the Azure Linux package repository at https://packages.microsoft.com/azurelinux/3.0/prod/. No user account is provisioned by default. To sign-in to these images, the sample meta-user-data.iso image must also be built and installed in your VM's CD drive. The cloud-init service will detect the iso and provision a user account and password. diff --git a/toolkit/docs/security/iso-image-verification.md b/toolkit/docs/security/iso-image-verification.md index 0f99aac73e2..31acbe5e3ff 100644 --- a/toolkit/docs/security/iso-image-verification.md +++ b/toolkit/docs/security/iso-image-verification.md @@ -5,7 +5,7 @@ | 1.0 | | | | | 2.0 | | | | -Once the ISO image, the checksum, and the checksum signature files are downloaded, it is strongly recommended that the integrity of the image is verified. This is a two-step process. First, ensure that the checksum file has not been tampered with by verifying the signature against Mariner's RPM signing public key. Second, check that the ISO image was not corrupted during the download. The following bash script shows the commands necessary to check both steps: +Once the ISO image, the checksum, and the checksum signature files are downloaded, it is strongly recommended that the integrity of the image is verified. This is a two-step process. First, ensure that the checksum file has not been tampered with by verifying the signature against Azure Linux's RPM signing public key. Second, check that the ISO image was not corrupted during the download. The following bash script shows the commands necessary to check both steps: ```bash # Assumption: we are in the directory containing the downloaded files @@ -13,15 +13,15 @@ Once the ISO image, the checksum, and the checksum signature files are downloade CHECKSUM_FILE="mariner-1.0-x86_64.iso.sha256" SIGNATURE_FILE="mariner-1.0-x86_64.iso.sha256.gpg" -# Download the Mariner RPM signing public key +# Download the Azure Linux RPM signing public key wget https://raw.githubusercontent.com/microsoft/CBL-Mariner/2.0/SPECS/azurelinux-repos/MICROSOFT-RPM-GPG-KEY # Import the RPM signing public key into the local GPG keystore gpg --import MICROSOFT-RPM-GPG-KEY -# Verify that the checksum file was produced by the Mariner team +# Verify that the checksum file was produced by the Azure Linux team # The output of this command should contain the following string: -# 'Good signature from "Mariner RPM Release Signing "' +# 'Good signature from "Azure Linux RPM Release Signing "' gpg --verify "$SIGNATURE_FILE" "$CHECKSUM_FILE" # Verify that the ISO image checksum matches the expected checksum diff --git a/toolkit/docs/security/read-only-roots.md b/toolkit/docs/security/read-only-roots.md index 9d48b274b1d..baa24030d71 100644 --- a/toolkit/docs/security/read-only-roots.md +++ b/toolkit/docs/security/read-only-roots.md @@ -52,7 +52,7 @@ Ideally as much of `/etc` as possible should be left read-only to avoid miss-con Verity supports error correction which will return the original data even if the underlying blocks have been modified (it does not restore the underlying data stored on disk however). FEC incurs some overhead but the hash tree, which is a sunk cost, makes it much more effective than normal Reed-Solomon codes. For a 2GiB disk, FEC with 2 roots (i.e. 2 bytes of error correction codes per 255 bytes of real data) can correct ~16MiB of errors with ~16MiB of overhead. See [veritydisk.go](../../tools/imagegen/configuration/veritydisk.go) for calculation details. ### Hash Tree and FEC Overhead -The extra data required for verity needs to be stored outside the measured partition. In the case of Mariner it is stored in the initramfs. Assuming the Merkle tree is a full m-ary tree with m=128 (128 branches per node, from `4k/sizeof(sha256)`), the size of the Merkle tree is: +The extra data required for verity needs to be stored outside the measured partition. In the case of Azure Linux it is stored in the initramfs. Assuming the Merkle tree is a full m-ary tree with m=128 (128 branches per node, from `4k/sizeof(sha256)`), the size of the Merkle tree is: ``` blockSize = 4k m = blockSize / sizeof(sha256) diff --git a/toolkit/imageconfigs/additionalconfigs/cloud-init.cfg b/toolkit/imageconfigs/additionalconfigs/cloud-init.cfg index 063dd582255..249702d9e66 100644 --- a/toolkit/imageconfigs/additionalconfigs/cloud-init.cfg +++ b/toolkit/imageconfigs/additionalconfigs/cloud-init.cfg @@ -72,12 +72,12 @@ cloud_final_modules: # (not accessible to handlers/transforms) system_info: # This will affect which distro class gets used - distro: mariner + distro: azurelinux # Default user name + that default users groups (if added/used) default_user: - name: mariner + name: azl_user lock_passwd: true - gecos: Mariner + gecos: AureLinux groups: [sudo, docker] sudo: ["ALL=(ALL) NOPASSWD:ALL"] shell: /bin/bash diff --git a/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg b/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg index 06b600d25a2..c35ed189990 100644 --- a/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg +++ b/toolkit/resources/assets/isomaker/iso_root_static_files/boot/grub2/grub.cfg @@ -2,7 +2,7 @@ set timeout=0 # The use of mariner.media=CDROM is a workaround that our installer does not require # but it is observed to be needed to boot on some hardware/SoCs. -menuentry "CBL-Mariner" { +menuentry "Azure Linux" { search --label CDROM --set root linux /isolinux/vmlinuz root=/dev/ram0 mariner.media=CDROM lockdown=integrity sysctl.kernel.unprivileged_bpf_disabled=1 console=tty0 console=ttyS0,115200n8 initrd /isolinux/initrd.img diff --git a/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller b/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller index 16099a0fd4c..1fe417f94a2 100755 --- a/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller +++ b/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller @@ -2,7 +2,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -# Use a custom termcap for the Mariner installer in an ISO environment +# Use a custom termcap for the Azure Linux installer in an ISO environment # for a high contrast cursor. This is based on the "linux" termcap. export TERMINFO=/usr/lib/mariner/terminfo export TERM=mariner-installer diff --git a/toolkit/resources/manifests/image/local.repo b/toolkit/resources/manifests/image/local.repo index cfc5ae14b30..9bd42cbc7ac 100644 --- a/toolkit/resources/manifests/image/local.repo +++ b/toolkit/resources/manifests/image/local.repo @@ -1,5 +1,5 @@ -[mariner-local-repo] -name=Mariner Local Build Repo $releasever $basearch +[azl-local-repo] +name=Azure Linux Local Build Repo $releasever $basearch baseurl=file:///mnt/cdrom/RPMS gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY enabled=1 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 0beb2fede0c..0bc17edc697 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -231,10 +231,10 @@ libffi-devel-3.4.4-1.azl3.aarch64.rpm libtasn1-4.19.0-1.azl3.aarch64.rpm p11-kit-0.25.0-1.azl3.aarch64.rpm p11-kit-trust-0.25.0-1.azl3.aarch64.rpm -ca-certificates-shared-3.0.0-3.azl3.noarch.rpm -ca-certificates-tools-3.0.0-3.azl3.noarch.rpm -ca-certificates-base-3.0.0-3.azl3.noarch.rpm -ca-certificates-3.0.0-3.azl3.noarch.rpm +ca-certificates-shared-3.0.0-4.azl3.noarch.rpm +ca-certificates-tools-3.0.0-4.azl3.noarch.rpm +ca-certificates-base-3.0.0-4.azl3.noarch.rpm +ca-certificates-3.0.0-4.azl3.noarch.rpm dwz-0.14-2.azl3.aarch64.rpm unzip-6.0-20.azl3.aarch64.rpm python3-3.12.0-2.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 172e29871eb..abfe106f3c5 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -231,10 +231,10 @@ libffi-devel-3.4.4-1.azl3.x86_64.rpm libtasn1-4.19.0-1.azl3.x86_64.rpm p11-kit-0.25.0-1.azl3.x86_64.rpm p11-kit-trust-0.25.0-1.azl3.x86_64.rpm -ca-certificates-shared-3.0.0-3.azl3.noarch.rpm -ca-certificates-tools-3.0.0-3.azl3.noarch.rpm -ca-certificates-base-3.0.0-3.azl3.noarch.rpm -ca-certificates-3.0.0-3.azl3.noarch.rpm +ca-certificates-shared-3.0.0-4.azl3.noarch.rpm +ca-certificates-tools-3.0.0-4.azl3.noarch.rpm +ca-certificates-base-3.0.0-4.azl3.noarch.rpm +ca-certificates-3.0.0-4.azl3.noarch.rpm dwz-0.14-2.azl3.x86_64.rpm unzip-6.0-20.azl3.x86_64.rpm python3-3.12.0-2.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 3c6d2d5110c..92a444def87 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -33,11 +33,11 @@ bzip2-1.0.8-1.azl3.aarch64.rpm bzip2-debuginfo-1.0.8-1.azl3.aarch64.rpm bzip2-devel-1.0.8-1.azl3.aarch64.rpm bzip2-libs-1.0.8-1.azl3.aarch64.rpm -ca-certificates-3.0.0-3.azl3.noarch.rpm -ca-certificates-base-3.0.0-3.azl3.noarch.rpm -ca-certificates-legacy-3.0.0-3.azl3.noarch.rpm -ca-certificates-shared-3.0.0-3.azl3.noarch.rpm -ca-certificates-tools-3.0.0-3.azl3.noarch.rpm +ca-certificates-3.0.0-4.azl3.noarch.rpm +ca-certificates-base-3.0.0-4.azl3.noarch.rpm +ca-certificates-legacy-3.0.0-4.azl3.noarch.rpm +ca-certificates-shared-3.0.0-4.azl3.noarch.rpm +ca-certificates-tools-3.0.0-4.azl3.noarch.rpm ccache-4.8.3-1.azl3.aarch64.rpm ccache-debuginfo-4.8.3-1.azl3.aarch64.rpm check-0.15.2-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index ed147e7ecfa..da3cae3c762 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -34,11 +34,11 @@ bzip2-1.0.8-1.azl3.x86_64.rpm bzip2-debuginfo-1.0.8-1.azl3.x86_64.rpm bzip2-devel-1.0.8-1.azl3.x86_64.rpm bzip2-libs-1.0.8-1.azl3.x86_64.rpm -ca-certificates-3.0.0-3.azl3.noarch.rpm -ca-certificates-base-3.0.0-3.azl3.noarch.rpm -ca-certificates-legacy-3.0.0-3.azl3.noarch.rpm -ca-certificates-shared-3.0.0-3.azl3.noarch.rpm -ca-certificates-tools-3.0.0-3.azl3.noarch.rpm +ca-certificates-3.0.0-4.azl3.noarch.rpm +ca-certificates-base-3.0.0-4.azl3.noarch.rpm +ca-certificates-legacy-3.0.0-4.azl3.noarch.rpm +ca-certificates-shared-3.0.0-4.azl3.noarch.rpm +ca-certificates-tools-3.0.0-4.azl3.noarch.rpm ccache-4.8.3-1.azl3.x86_64.rpm ccache-debuginfo-4.8.3-1.azl3.x86_64.rpm check-0.15.2-1.azl3.x86_64.rpm diff --git a/toolkit/scripts/analysis.mk b/toolkit/scripts/analysis.mk index b9a973b451e..757571d8c7b 100644 --- a/toolkit/scripts/analysis.mk +++ b/toolkit/scripts/analysis.mk @@ -6,7 +6,7 @@ # - Run check for ABI changes of built packages. # - Run check for .so files version change of built packages. -# Requires DNF on Mariner / yum and yum-utils on Ubuntu. +# Requires DNF on Azure Linux / yum and yum-utils on Ubuntu. # A folder with sodiff-related artifacts SODIFF_OUTPUT_FOLDER=$(BUILD_DIR)/sodiff diff --git a/toolkit/scripts/build_tag.mk b/toolkit/scripts/build_tag.mk index 11d49bf98c0..e6938f8d8a7 100644 --- a/toolkit/scripts/build_tag.mk +++ b/toolkit/scripts/build_tag.mk @@ -41,7 +41,7 @@ DIST_VERSION_MACRO := $(DIST_NAME_ABRV) $(dist_major_version_number) ##help:var:DIST_TAG:=Distribution tag, defines the "dist" macro used by the specs. Default: '.' e.g., ".azl3" DIST_TAG ?= .$(DIST_NAME_ABRV)$(dist_major_version_number) -# Mariner Image Customizer version. +# Azure Linux Image Customizer version. # This is using semantic versioning. # # IMAGE_CUSTOMIZER_VERSION should have the format: diff --git a/toolkit/scripts/containerized-build/create_container_build.sh b/toolkit/scripts/containerized-build/create_container_build.sh index b146344772c..055b9fc5f52 100755 --- a/toolkit/scripts/containerized-build/create_container_build.sh +++ b/toolkit/scripts/containerized-build/create_container_build.sh @@ -41,7 +41,7 @@ Optional arguments: ENABLE_REPO: Set to 'y' to use local RPMs to satisfy package dependencies. default: n KEEP_CONTAINER: Set to 'y' to not cleanup container upon exit. default: n - * User can override Mariner make definitions. Some useful overrides could be + * User can override Azure Linux make definitions. Some useful overrides could be SPECS_DIR: build specs from another directory like SPECS-EXTENDED by providing SPECS_DIR=path/to/SPECS-EXTENDED. default: $REPO_PATH/SPECS SRPM_PACK_LIST: provide a list of SRPMS to build by providing SRPM_PACK_LIST=\"srpm1 srpm2 ...\". default: builds all SRPMS from $SPECS_DIR RPMS_DIR: choose which built RPMs to mount into container by providing RPMS_DIR=path/to/custom/out/RPMS. default: $REPO_PATH/out/RPMS @@ -103,7 +103,7 @@ done [[ -z "${mode}" ]] && mode="build" [[ -z "${version}" ]] && version="3.0" -# Set relevant folder definitions using Mariner Makefile that can be overriden by user +# Set relevant folder definitions using Azure Linux Makefile that can be overriden by user # Default values are populated from toolkit/Makefile PROJECT_ROOT=$repo_path toolkit_root="$PROJECT_ROOT/toolkit" @@ -149,10 +149,10 @@ cd "${script_dir}" || { print_error "Could not change directory to ${script_dir # ==================== Setup ==================== -# Get Mariner GitHub branch at $repo_path +# Get Azure Linux GitHub branch at $repo_path repo_branch=$(git -C ${repo_path} rev-parse --abbrev-ref HEAD) -# Generate text based on mode (Use figlet to generate splash text once available on Mariner) +# Generate text based on mode (Use figlet to generate splash text once available on Azure Linux) if [[ "${mode}" == "build" ]]; then echo -e "\033[31m -----------------------------------------------------------------------------------------\033[0m" > ${tmp_dir}/splash.txt echo -e "\033[31m ----------------------------------- MARINER BUILDER ! ----------------------------------- \033[0m" >> ${tmp_dir}/splash.txt diff --git a/toolkit/scripts/containerized-build/resources/local_repo b/toolkit/scripts/containerized-build/resources/local_repo index e46bc849f32..f824aa76c20 100644 --- a/toolkit/scripts/containerized-build/resources/local_repo +++ b/toolkit/scripts/containerized-build/resources/local_repo @@ -1,5 +1,5 @@ [host_build_repo] -name=Mariner Host Build Repo +name=Azure Linux Host Build Repo baseurl=file:///repo/ gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY enabled=1 @@ -8,7 +8,7 @@ skip_if_unavailable=False sslverify=0 [local_build_repo] -name=Mariner Local Build Repo +name=Azure Linux Local Build Repo baseurl=file:///usr/src/azl/RPMS/ gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY enabled=1 diff --git a/toolkit/scripts/containerized-build/resources/mariner-3_repo b/toolkit/scripts/containerized-build/resources/mariner-3_repo index 30f7db6991d..4178a053c6b 100644 --- a/toolkit/scripts/containerized-build/resources/mariner-3_repo +++ b/toolkit/scripts/containerized-build/resources/mariner-3_repo @@ -1,5 +1,5 @@ -[mariner-3.0-daily-build] -name=CBL-Mariner 3.0 Daily Build Repo +[azl-3.0-daily-build] +name=Azure Linux 3.0 Daily Build Repo baseurl=https://mariner3dailydevrepo.blob.core.windows.net/daily-repo-- gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY gpgcheck=0 diff --git a/toolkit/scripts/containerized-build/resources/setup_functions.sh b/toolkit/scripts/containerized-build/resources/setup_functions.sh index c4798dfd06a..9335f5b01d6 100644 --- a/toolkit/scripts/containerized-build/resources/setup_functions.sh +++ b/toolkit/scripts/containerized-build/resources/setup_functions.sh @@ -12,7 +12,7 @@ IS_REPO_ENABLED=false # General setup -## Mariner macro files used during spec parsing (as defined in toolkit/scripts/rpmops.sh) +## Azure Linux macro files used during spec parsing (as defined in toolkit/scripts/rpmops.sh) DEFINES=(-D "with_check 1") MACROS=() for macro_file in "$SPECS_DIR"/azurelinux-rpm-macros/macros* "$SPECS_DIR"/pyproject-rpm-macros/macros.pyproject "$SPECS_DIR"/perl/macros.perl @@ -75,7 +75,7 @@ show_help() { echo "******************************************************************************************" } -# Refresh repo cache with newly built RPM, use Mariner specific DEFINES +# Refresh repo cache with newly built RPM, use Azure Linux specific DEFINES rpmbuild() { local args=("$@") command "$FUNCNAME" "${DEFINES[@]}" "${args[@]}" @@ -178,7 +178,7 @@ install_dependencies() { return $exit_code } -# use Mariner specific DEFINES +# use Azure Linux specific DEFINES rpmspec() { local args=("$@") command "$FUNCNAME" "${DEFINES[@]}" "${args[@]}" diff --git a/toolkit/scripts/containerized-build/resources/welcome.txt b/toolkit/scripts/containerized-build/resources/welcome.txt index 1fe5fc4ac2b..4ff5b86be22 100644 --- a/toolkit/scripts/containerized-build/resources/welcome.txt +++ b/toolkit/scripts/containerized-build/resources/welcome.txt @@ -11,7 +11,7 @@ 1) run\e[32m install_dependencies pkg\e[0m to install 'BuildRequires' dependencies from spec 2) run\e[32m install_dependencies_depsearch pkg\e[0m to install - dependencies using Mariner depsearch tool + dependencies using Azure Linux depsearch tool 3) use dnf repoquery: run\e[32m tdnf install -y dnf dnf-plugins-core\e[0m, \e[32m dnf builddep -y my-pkg.spec\e[0m * Show package dependencies: run\e[32m tdnf install -y dnf\e[0m,\e[32m dnf repoquery --deplist my-pkg\e[0m @@ -28,7 +28,7 @@ * Individual packages may be installed directly via\e[32m tdnf install /repo//pkg.rpm and /repo/noarch/pkg.rpm\e[0m * * \e[31mDirectory information:\e[0m -* Mariner repo path: -* Mariner repo branch: +* Azure Linux repo path: +* Azure Linux repo branch: * * \e[31mMount points:\e[0m diff --git a/toolkit/scripts/help.mk b/toolkit/scripts/help.mk index c24f02224f1..893521656a4 100644 --- a/toolkit/scripts/help.mk +++ b/toolkit/scripts/help.mk @@ -72,7 +72,7 @@ # Top-level description. # -##help:desc:This Makefile is the primary entry point for the Mariner Toolkit. +##help:desc:This Makefile is the primary entry point for the Azure Linux Toolkit. ##help:desc: ##help:desc:For full details, please consult the documentation under toolkit/docs. diff --git a/toolkit/scripts/rpmops.sh b/toolkit/scripts/rpmops.sh index b653a4aa83a..9e349405af1 100755 --- a/toolkit/scripts/rpmops.sh +++ b/toolkit/scripts/rpmops.sh @@ -2,14 +2,14 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -# Helper functions for working with RPM tools in Mariner's context. +# Helper functions for working with RPM tools in Azure Linux's context. REPO_ROOT="$(git rev-parse --show-toplevel)" RPM_SHELL="$(readlink /bin/sh)" if [[ "$RPM_SHELL" != "bash" ]] then - echo "WARNING: host system's '/bin/sh' links to '$RPM_SHELL'. Mariner specs require 'bash'. Parsing specs may fail or generate unpredictable results." >&2 + echo "WARNING: host system's '/bin/sh' links to '$RPM_SHELL'. Azure Linux specs require 'bash'. Parsing specs may fail or generate unpredictable results." >&2 fi # Additional macros required to parse spec files. @@ -20,7 +20,7 @@ DEFINES=(-D "with_check 1" -D "dist $DIST_TAG" -D "$DISTRO_MACRO") SPECS_DIR="$REPO_ROOT/SPECS" -# Mariner macro files used during spec parsing. +# Azure Linux macro files used during spec parsing. MACROS=() for macro_file in "$SPECS_DIR"/azurelinux-rpm-macros/macros* "$SPECS_DIR"/pyproject-rpm-macros/macros.pyproject "$SPECS_DIR"/perl/macros.perl do diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index 8e98aa8cd24..2f3365210f4 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -446,7 +446,7 @@ chroot_and_install_rpms python-setuptools python3-setuptools build_rpm_in_chroot_no_install libxml2 chroot_and_install_rpms libxml2 -# Download JDK rpms (from CBL-Mariner 2.0 repo until it reaches AzuleLinux 3.0 repo on PMC) +# Download JDK rpms (from Azure Linux 2.0 repo until it reaches AzuleLinux 3.0 repo on PMC) echo Download JDK rpms case $(uname -m) in x86_64) diff --git a/toolkit/scripts/toolchain/container/Dockerfile b/toolkit/scripts/toolchain/container/Dockerfile index abfd7aeccb7..864cd96079f 100644 --- a/toolkit/scripts/toolchain/container/Dockerfile +++ b/toolkit/scripts/toolchain/container/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # -# Dockerfile to build Mariner toolchain from scratch +# Dockerfile to build Azure Linux toolchain from scratch # FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20240123 diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh index fc188399565..aa0bf52f9b3 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh @@ -645,7 +645,7 @@ esac unset GCC_ARCH # CFLAGS="-O2 -g" \ # CXXFLAGS="-O2 -g" \ -# Libffi is causing error building: find: '/usr/src/mariner/BUILDROOT/libffi-3.4.2-1.azl3.x86_64//usr/lib64': No such file or directory +# Libffi is causing error building: find: '/usr/src/azl/BUILDROOT/libffi-3.4.2-1.azl3.x86_64//usr/lib64': No such file or directory make -j$(nproc) make install popd diff --git a/toolkit/scripts/toolchain/container/toolchain_initial_chroot_setup.sh b/toolkit/scripts/toolchain/container/toolchain_initial_chroot_setup.sh index 8c1c64ad1e9..48aa8bddff0 100755 --- a/toolkit/scripts/toolchain/container/toolchain_initial_chroot_setup.sh +++ b/toolkit/scripts/toolchain/container/toolchain_initial_chroot_setup.sh @@ -86,11 +86,11 @@ nogroup:x:65534: EOF cat > /etc/os-release << "EOF" -NAME="Common Base Linux Mariner Toolchain" -VERSION="3.0.2023" -ID=mariner +NAME="Azure Linux Toolchain" +VERSION="3.0.2024" +ID=azurelinux VERSION_ID="3.0" -PRETTY_NAME="Azure Linux" +PRETTY_NAME="Azure Linux 3.0" ANSI_COLOR="1;34" HOME_URL="https://aka.ms/cbl-mariner" BUG_REPORT_URL="https://aka.ms/cbl-mariner" diff --git a/toolkit/scripts/toolchain/toolchain_clean.sh b/toolkit/scripts/toolchain/toolchain_clean.sh index fcc5ffe7cb9..8b0fd033a25 100755 --- a/toolkit/scripts/toolchain/toolchain_clean.sh +++ b/toolkit/scripts/toolchain/toolchain_clean.sh @@ -2,11 +2,11 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. -# Clean up any containers used during Mariner builds. These containers will +# Clean up any containers used during Azure Linux builds. These containers will # be rooted in a container called 'marinertoolchain:*', with committed children # called marinertoolchain_populated:*. # We use a tag 'marinertoolchain'=MARINER_BUILD_DIR to identify containers, where -# MARINER_BUILD_DIR is the absolute path to the Mariner build directory. +# MARINER_BUILD_DIR is the absolute path to the Azure Linux build directory. set -e diff --git a/toolkit/tools/boilerplate/boilerplate.go b/toolkit/tools/boilerplate/boilerplate.go index 67472f75434..a32b9e6307a 100644 --- a/toolkit/tools/boilerplate/boilerplate.go +++ b/toolkit/tools/boilerplate/boilerplate.go @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. -// A boilerplate for Mariner go tools +// A boilerplate for Azure Linux go tools package main @@ -17,7 +17,7 @@ import ( ) var ( - app = kingpin.New("boilerplate", "A sample golang tool for Mariner.") + app = kingpin.New("boilerplate", "A sample golang tool for Azure Linux.") logFlags = exe.SetupLogFlags(app) timestampFile = app.Flag("timestamp-file", "File that stores timestamps for this program.").String() diff --git a/toolkit/tools/grapher/grapher.go b/toolkit/tools/grapher/grapher.go index bed0f307af4..1fed34c8f1a 100644 --- a/toolkit/tools/grapher/grapher.go +++ b/toolkit/tools/grapher/grapher.go @@ -91,7 +91,7 @@ func main() { enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagPreview } if *disableDefaultRepos { - enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagMarinerDefaults + enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagDistroDefaults } cloner.SetEnabledRepos(enabledRepos) diff --git a/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go b/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go index f8a38e77866..2ba999a356d 100644 --- a/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go +++ b/toolkit/tools/graphpkgfetcher/graphpkgfetcher.go @@ -177,7 +177,7 @@ func setupCloner() (cloner *rpmrepocloner.RpmRepoCloner, err error) { enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagUpstream } if *disableDefaultRepos { - enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagMarinerDefaults + enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagDistroDefaults } cloner.SetEnabledRepos(enabledRepos) return diff --git a/toolkit/tools/imagecustomizer/README.md b/toolkit/tools/imagecustomizer/README.md index af40037ed7d..457d00ddb96 100644 --- a/toolkit/tools/imagecustomizer/README.md +++ b/toolkit/tools/imagecustomizer/README.md @@ -1,11 +1,11 @@ -# Mariner Image Customizer +# Azure Linux Image Customizer -The Mariner Image Customizer (MIC) is a tool that can take an existing generic Mariner +The Azure Linux Image Customizer is a tool that can take an existing generic Azure Linux image and modify it to be suited for particular scenario. MIC uses [chroot](https://en.wikipedia.org/wiki/Chroot) (and loopback block devices) to customize the image. -This is the same technology used to build the Mariner images (along with most other +This is the same technology used to build the Azure Linux images (along with most other Linux distros). This is in contrast to some other image customization tools, like Packer, which customize the image by booting it inside a VM. @@ -29,7 +29,7 @@ Disadvantages: ## Getting started -1. Download a Mariner core image. +1. Download an Azure Linux core image. 2. Create a customization config file. @@ -42,11 +42,11 @@ Disadvantages: ``` For documentation on the supported configuration options, see: - [Mariner Image Customizer configuration](./docs/configuration.md) + [Azure Linux Image Customizer configuration](./docs/configuration.md) -3. Install prerequisites to run Mariner Image Customizer: `qemu-img,rpm,dd,lsblk,losetup,sfdisk,udevadm,flock,blkid,openssl,sed,createrepo,squashfs-tools,genisoimage,dosfstools` +3. Install prerequisites to run Azure Linux Image Customizer: `qemu-img,rpm,dd,lsblk,losetup,sfdisk,udevadm,flock,blkid,openssl,sed,createrepo,squashfs-tools,genisoimage,dosfstools` -4. Run the Mariner Image Customizer tool. +4. Run the Azure Linux Image Customizer tool. For example: @@ -65,7 +65,7 @@ Disadvantages: - ``: The configuration file created in Step 2. For a description of all the command line options, see: - [Mariner Image Customizer command line](./docs/cli.md) + [Azure Linux Image Customizer command line](./docs/cli.md) 5. Use the customized image. diff --git a/toolkit/tools/imagecustomizer/docs/cli.md b/toolkit/tools/imagecustomizer/docs/cli.md index ac9958b3e99..b0fd8f30770 100644 --- a/toolkit/tools/imagecustomizer/docs/cli.md +++ b/toolkit/tools/imagecustomizer/docs/cli.md @@ -1,4 +1,4 @@ -# Mariner Image Customizer command line +# Azure Linux Image Customizer command line ## --help @@ -16,8 +16,8 @@ Required. The base image file to customize. -This file is typically one of the standard Mariner core images. -But it can also be a Mariner image that has been customized. +This file is typically one of the standard Azure Linux core images. +But it can also be an Azure Linux image that has been customized. Supported image file formats: vhd, vhdx, qcow2, and raw. @@ -36,7 +36,7 @@ Options: vhd, vhdx, qcow2, raw, and iso. At least one of `--output-image-format` and `--output-split-partitions-format` is required. When the output image format is set to iso, the generated image is a LiveOS -iso image. For more details on this format, see: [Mariner Image Customizer ISO Support](./iso.md). +iso image. For more details on this format, see: [Azure Linux Image Customizer ISO Support](./iso.md). ## --output-split-partitions-format=FORMAT @@ -61,7 +61,7 @@ The file path of the YAML (or JSON) configuration file that specifies how to cus the image. For documentation on the supported configuration options, see: -[Mariner Image Customizer configuration](./docs/configuration.md) +[Azure Linux Image Customizer configuration](./docs/configuration.md) ## --rpm-source=PATH diff --git a/toolkit/tools/imagecustomizer/docs/configuration.md b/toolkit/tools/imagecustomizer/docs/configuration.md index 43c281f67b5..7d100ae586d 100644 --- a/toolkit/tools/imagecustomizer/docs/configuration.md +++ b/toolkit/tools/imagecustomizer/docs/configuration.md @@ -1,6 +1,6 @@ -# Mariner Image Customizer configuration +# Azure Linux Image Customizer configuration -The Mariner Image Customizer is configured using a YAML (or JSON) file. +The Azure Linux Image Customizer is configured using a YAML (or JSON) file. ### Operation ordering @@ -338,7 +338,7 @@ If this field is not specified, then the existing SELinux mode in the base image maintained. Otherwise, the image is modified to match the requested SELinux mode. -The Mariner Image Customizer tool can enable SELinux on a base image with SELinux +The Azure Linux Image Customizer tool can enable SELinux on a base image with SELinux disabled and it can disable SELinux on a base image that has SELinux enabled. However, using a base image that already has the required SELinux mode will speed-up the customization process. @@ -362,7 +362,7 @@ Supported options: Note: For images with SELinux enabled, the `selinux-policy` package must be installed. This package contains the default SELinux rules and is required for SELinux-enabled images to be functional. -The Mariner Image Customizer tool will report an error if the package is missing from +The Azure Linux Image Customizer tool will report an error if the package is missing from the image. Note: If you wish to apply additional SELinux policies on top of the base SELinux diff --git a/toolkit/tools/imagecustomizer/docs/iso.md b/toolkit/tools/imagecustomizer/docs/iso.md index 4ec920de820..4a141ac2124 100644 --- a/toolkit/tools/imagecustomizer/docs/iso.md +++ b/toolkit/tools/imagecustomizer/docs/iso.md @@ -1,8 +1,8 @@ -# Mariner Image Customizer ISO Support +# Azure Linux Image Customizer ISO Support ## Overview -Given a full disk image, the Mariner Image Customizer (MIC) can generate a +Given a full disk image, the Azure Linux Image Customizer can generate a LiveOS ISO image when the `--output-image-format` is set to `iso`. The LiveOS ISO image is a bootable image that boots into the rootfs of the @@ -43,7 +43,7 @@ The current implementation for the LiveOS ISO does not support the following: - The user can specify one or more files to be copied to the iso media. - The user can add kernel parameters. -For a full list of capabilities, see Mariner Image Customizer's iso +For a full list of capabilities, see Azure Linux Image Customizer's iso configuration section: [Config.ISO](./configuration.md#iso-type). ## cloud-init Support diff --git a/toolkit/tools/imagecustomizerapi/README.md b/toolkit/tools/imagecustomizerapi/README.md index 65fcb89858f..07b326faddb 100644 --- a/toolkit/tools/imagecustomizerapi/README.md +++ b/toolkit/tools/imagecustomizerapi/README.md @@ -1,9 +1,9 @@ -# Mariner Image Customizer API +# Azure Linux Image Customizer API -The Mariner image customizer (imgcustomizer) will be released as a standalone tool and +The Azure Linux image customizer (imgcustomizer) will be released as a standalone tool and will provide strong backwards compatibility guarantees (after the first official release). -This is contrast to the Mariner toolkit's new image config, which isn't officially +This is contrast to the Azure Linux toolkit's new image config, which isn't officially released and doesn't provide any backwards compatibility guarantees. While currently the new image config and imgcustomizer config are very similar, in the diff --git a/toolkit/tools/imagecustomizerapi/systemconfig.go b/toolkit/tools/imagecustomizerapi/systemconfig.go index 8d5bd729a77..2f4b8418016 100644 --- a/toolkit/tools/imagecustomizerapi/systemconfig.go +++ b/toolkit/tools/imagecustomizerapi/systemconfig.go @@ -138,7 +138,7 @@ func (s *SystemConfig) IsValid() error { } } // Enforce that only one or zero persistent partitions to support - // Overlays. Currently, the Overlayfs Dracut module from CBL-Mariner RPM + // Overlays. Currently, the Overlayfs Dracut module from Azure Linux RPM // supports at most one persistent partition across all configured // overlays. While multiple overlays can be defined, only one of these // can be configured with a persistent storage option to ensure diff --git a/toolkit/tools/imagegen/attendedinstaller/speakuputils/speakuputils.go b/toolkit/tools/imagegen/attendedinstaller/speakuputils/speakuputils.go index 3afc56b2bbe..d3b46c39e18 100644 --- a/toolkit/tools/imagegen/attendedinstaller/speakuputils/speakuputils.go +++ b/toolkit/tools/imagegen/attendedinstaller/speakuputils/speakuputils.go @@ -18,7 +18,7 @@ const ( // CreateVirtualKeyboard creates and returns a virtual keyboard from the uinput package func CreateVirtualKeyboard() (keyboard uinput.Keyboard, err error) { - keyboard, err = uinput.CreateKeyboard("/dev/uinput", []byte("MarinerVirtualKeyboard")) + keyboard, err = uinput.CreateKeyboard("/dev/uinput", []byte("isoVirtualKeyboard")) return } diff --git a/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go b/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go index 73c0caf86d5..4d9977d5409 100644 --- a/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go +++ b/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go @@ -415,7 +415,7 @@ func (mp *ManualPartitionWidget) populateTable() (err error) { mp.partitionTable.SetCell(tableHeaderRow, i, cell) } - // Hardcode to GPT only for now since all image configurations within Mariner are using GPT partition table type + // Hardcode to GPT only for now since all image configurations within Azure Linux are using GPT partition table type bootPartitionMountPoint, _, _, err := configuration.BootPartitionConfig(mp.bootType, configuration.PartitionTableTypeGpt) if err != nil { return diff --git a/toolkit/tools/imagegen/configuration/configuration.go b/toolkit/tools/imagegen/configuration/configuration.go index 26199281d01..969aa098fa3 100644 --- a/toolkit/tools/imagegen/configuration/configuration.go +++ b/toolkit/tools/imagegen/configuration/configuration.go @@ -18,7 +18,7 @@ import ( ) // Artifact [non-ISO image building only] defines the name, type -// and optional compression of the output Mariner image. +// and optional compression of the output Azure Linux image. type Artifact struct { Compression string `json:"Compression"` Name string `json:"Name"` @@ -34,7 +34,7 @@ type RawBinary struct { } // TargetDisk [kickstart-only] defines the physical disk, to which -// Mariner should be installed. +// Azure Linux should be installed. type TargetDisk struct { Type string `json:"Type"` Value string `json:"Value"` diff --git a/toolkit/tools/imagegen/configuration/configuration_test.go b/toolkit/tools/imagegen/configuration/configuration_test.go index 60ec6ed5ef7..e4252b498da 100644 --- a/toolkit/tools/imagegen/configuration/configuration_test.go +++ b/toolkit/tools/imagegen/configuration/configuration_test.go @@ -423,7 +423,7 @@ var expectedConfiguration Config = Config{ "local/path/file5": {{Path: "/final/system/path/file5"}}, "local/path/file6": {{Path: "/final/system/path/file6"}, {Path: "/final/system/path/file6_copy"}}, }, - Hostname: "Mariner-Test", + Hostname: "Azure-Linux-Test", BootType: "efi", Groups: []Group{ { @@ -563,7 +563,7 @@ var expectedConfiguration Config = Config{ KernelOptions: map[string]string{ "default": "kernel", }, - Hostname: "Mariner-TestA", + Hostname: "Azure-Linux-TestA", Users: []User{ { Name: "basicuser", @@ -599,7 +599,7 @@ var expectedConfiguration Config = Config{ KernelOptions: map[string]string{ "default": "kernel", }, - Hostname: "Mariner-TestB", + Hostname: "Azure-Linux-TestB", Users: []User{ { Name: "basicuser", diff --git a/toolkit/tools/imagegen/configuration/parse_partition.go b/toolkit/tools/imagegen/configuration/parse_partition.go index c8c99107ac2..308513e3314 100644 --- a/toolkit/tools/imagegen/configuration/parse_partition.go +++ b/toolkit/tools/imagegen/configuration/parse_partition.go @@ -126,11 +126,11 @@ func processPartitionTableType() (err error) { // whether the users prefer creation of GPT disk label or not. The value of "--gpt" // is a bool where "True" indicates using GPT and "False" if not, which means using MBR. // This config is set as a boot option within /proc/cmdline, which will be parsed by anaconda - // during installation process. Thus, Mariner will also pick the same design to reach compatibility + // during installation process. Thus, Azure Linux will also pick the same design to reach compatibility // with kickstart scenario // Please note that this code is only executed during kickstart installation, when "IsKickStartBoot" is set to true. - // Mariner installer currently does not allow direct specification of disk and partition layout within + // Azure Linux installer currently does not allow direct specification of disk and partition layout within // the image config file for kickstart installation. So any disk/partition setting you make in the image config file // will be overwritten if you enable kickstart installation mode. isGPTPartitionTable, err := GetKernelCmdLineValue("--gpt") diff --git a/toolkit/tools/imagegen/configuration/testdata/test_configuration.json b/toolkit/tools/imagegen/configuration/testdata/test_configuration.json index 7e2d4d5ed79..a5556c54b65 100644 --- a/toolkit/tools/imagegen/configuration/testdata/test_configuration.json +++ b/toolkit/tools/imagegen/configuration/testdata/test_configuration.json @@ -139,7 +139,7 @@ "local/path/file5": [ { "Path": "/final/system/path/file5" }], "local/path/file6": [ { "Path": "/final/system/path/file6" }, "/final/system/path/file6_copy" ] }, - "Hostname": "Mariner-Test", + "Hostname": "Azure-Linux-Test", "BootType": "efi", "Groups": [ { @@ -267,7 +267,7 @@ "KernelOptions": { "default": "kernel" }, - "Hostname": "Mariner-TestA", + "Hostname": "Azure-Linux-TestA", "Users": [ { "Name": "basicuser", @@ -299,7 +299,7 @@ "KernelOptions": { "default": "kernel" }, - "Hostname": "Mariner-TestB", + "Hostname": "Azure-Linux-TestB", "Users": [ { "Name": "basicuser", diff --git a/toolkit/tools/imagegen/diskutils/diskutils.go b/toolkit/tools/imagegen/diskutils/diskutils.go index ec81740a898..a4c957e8331 100644 --- a/toolkit/tools/imagegen/diskutils/diskutils.go +++ b/toolkit/tools/imagegen/diskutils/diskutils.go @@ -26,8 +26,8 @@ var ( // When calling mkfs, the default options change depending on the host OS you are running on and typically match // what the distro has decided is best for their OS. For example, for ext2/3/4, the defaults are stored in // /etc/mke2fs.conf. - // However, when building Mariner images, the defaults should be as consistent as possible and should only contain - // features that are supported on Mariner. + // However, when building Azure Linux images, the defaults should be as consistent as possible and should only contain + // features that are supported on Azure Linux. DefaultMkfsOptions = map[string][]string{ "ext2": {"-b", "4096", "-O", "none,sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr"}, "ext3": {"-b", "4096", "-O", "none,sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr,has_journal"}, diff --git a/toolkit/tools/imagegen/installutils/installutils.go b/toolkit/tools/imagegen/installutils/installutils.go index 0860ce3c0c1..3180dd59632 100644 --- a/toolkit/tools/imagegen/installutils/installutils.go +++ b/toolkit/tools/imagegen/installutils/installutils.go @@ -1131,7 +1131,7 @@ func InstallGrubEnv(installRoot string) (err error) { // - kernelCommandLine contains additional kernel parameters which may be optionally set // - readOnlyRoot holds the dm-verity read-only root partition information if dm-verity is enabled. // - isBootPartitionSeparate is a boolean value which is true if the /boot partition is separate from the root partition -// - includeLegacyCfg specifies if the legacy grub.cfg from Mariner 2.0 should also be added. +// - includeLegacyCfg specifies if the legacy grub.cfg from Azure Linux should also be added. // Note: this boot partition could be different than the boot partition specified in the bootloader. // This boot partition specifically indicates where to find the kernel, config files, and initrd func InstallGrubDefaults(installRoot, rootDevice, bootUUID, bootPrefix string, @@ -1147,7 +1147,7 @@ func InstallGrubDefaults(installRoot, rootDevice, bootUUID, bootPrefix string, } if includeLegacyCfg { - // Add the legacy /boot/grub2/grub.cfg file, which was used in Mariner 2.0. + // Add the legacy /boot/grub2/grub.cfg file, which was used in Azure Linux 2.0. err = installGrubTemplateFile(resources.AssetsGrubCfgFile, GrubCfgFile, installRoot, rootDevice, bootUUID, bootPrefix, encryptedRoot, kernelCommandLine, readOnlyRoot, isBootPartitionSeparate) if err != nil { diff --git a/toolkit/tools/imagepkgfetcher/imagepkgfetcher.go b/toolkit/tools/imagepkgfetcher/imagepkgfetcher.go index 4536ac8b199..d4f9721e311 100644 --- a/toolkit/tools/imagepkgfetcher/imagepkgfetcher.go +++ b/toolkit/tools/imagepkgfetcher/imagepkgfetcher.go @@ -88,7 +88,7 @@ func main() { enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagUpstream } if *disableDefaultRepos { - enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagMarinerDefaults + enabledRepos = enabledRepos & ^rpmrepocloner.RepoFlagDistroDefaults } cloner.SetEnabledRepos(enabledRepos) diff --git a/toolkit/tools/imager/imager.go b/toolkit/tools/imager/imager.go index cb84793301f..726616f72fd 100644 --- a/toolkit/tools/imager/imager.go +++ b/toolkit/tools/imager/imager.go @@ -152,7 +152,7 @@ func buildSystemConfig(systemConfig configuration.SystemConfig, disks []configur return } - // Mariner images don't work appropriately when azurelinux-release is not installed. + // Azure Linux images don't work appropriately when azurelinux-release is not installed. // As a stopgap to this, azurelinux-release will now be added to all images regardless // of presence in the CONFIG_FILE packagesToInstall = append([]string{distroReleasePackage}, packagesToInstall...) diff --git a/toolkit/tools/internal/buildpipeline/buildpipeline.go b/toolkit/tools/internal/buildpipeline/buildpipeline.go index 28c020879fe..873c937ef00 100644 --- a/toolkit/tools/internal/buildpipeline/buildpipeline.go +++ b/toolkit/tools/internal/buildpipeline/buildpipeline.go @@ -24,7 +24,7 @@ const ( // IsRegularBuild indicates if it is a regular build (without using docker) func IsRegularBuild() bool { - // some specific build pipeline builds Mariner from a Docker container and + // some specific build pipeline builds Azure Linux from a Docker container and // consequently have special requirements with regards to chroot // check if .dockerenv file exist to disambiguate build pipeline dockerEnvExists, _ := file.PathExists("/.dockerenv") diff --git a/toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go b/toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go index 6a1ce6f85ed..bea7301d383 100644 --- a/toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go +++ b/toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go @@ -24,15 +24,15 @@ import ( // RepoFlag* flags are used to denote which repos the cloner is allowed to use for its queries. const ( - RepoFlagMarinerDefaults = uint64(1) << iota // External default Mariner repos pre-installed in the chroot. + RepoFlagDistroDefaults = uint64(1) << iota // External default Azure Linux repos pre-installed in the chroot. RepoFlagDownloadedCache // Local repo with the cached packages downloaded from upstream. RepoFlagLocalBuilds // Local repo with the packages built from local spec files. - RepoFlagPreview // Separate flag to control the use of the Mariner preview packages repository. + RepoFlagPreview // Separate flag to control the use of the Azure Linux preview packages repository. RepoFlagToolchain // Local repo with the toolchain packages. RepoFlagUpstream // Separate flag to control the use of all upstream packages repositories. // A compound flag enabling all supported repositories. - RepoFlagAll = RepoFlagToolchain | RepoFlagLocalBuilds | RepoFlagDownloadedCache | RepoFlagPreview | RepoFlagMarinerDefaults | RepoFlagUpstream + RepoFlagAll = RepoFlagToolchain | RepoFlagLocalBuilds | RepoFlagDownloadedCache | RepoFlagPreview | RepoFlagDistroDefaults | RepoFlagUpstream ) const ( @@ -52,13 +52,13 @@ const ( // RpmRepoCloner represents an RPM repository cloner. type RpmRepoCloner struct { - chroot *safechroot.Chroot - chrootCloneDir string - defaultMarinerRepoIDs []string - mountedCloneDir string - repoIDCache string - reposArgsList [][]string - reposFlags uint64 + chroot *safechroot.Chroot + chrootCloneDir string + defaultAzureLinuxRepoIDs []string + mountedCloneDir string + repoIDCache string + reposArgsList [][]string + reposFlags uint64 } // ConstructCloner constructs a new RpmRepoCloner. @@ -277,7 +277,7 @@ func (r *RpmRepoCloner) initializeRepoDefinitions(repoDefinitions []string) (err if err != nil { return err } - r.defaultMarinerRepoIDs = append(r.defaultMarinerRepoIDs, repoIDs...) + r.defaultAzureLinuxRepoIDs = append(r.defaultAzureLinuxRepoIDs, repoIDs...) err = appendRepoFile(originalRepoFilePath, dstFile) if err != nil { @@ -732,16 +732,16 @@ func (r *RpmRepoCloner) SetEnabledRepos(reposFlags uint64) { previousReposList = append(previousReposList, fmt.Sprintf("--disablerepo=%s", repoIDPreview)) } - if RepoFlagMarinerDefaults&reposFlags == 0 { - previousReposList = append(previousReposList, r.disabledDefaultMarinerReposArgs()...) + if RepoFlagDistroDefaults&reposFlags == 0 { + previousReposList = append(previousReposList, r.disabledDefaultAzureLinuxReposArgs()...) } r.reposArgsList = append(r.reposArgsList, previousReposList) } -func (r *RpmRepoCloner) disabledDefaultMarinerReposArgs() (args []string) { - args = make([]string, len(r.defaultMarinerRepoIDs)) - for i, repoID := range r.defaultMarinerRepoIDs { +func (r *RpmRepoCloner) disabledDefaultAzureLinuxReposArgs() (args []string) { + args = make([]string, len(r.defaultAzureLinuxRepoIDs)) + for i, repoID := range r.defaultAzureLinuxRepoIDs { args[i] = fmt.Sprintf("--disablerepo=%s", repoID) } diff --git a/toolkit/tools/internal/resources/assets/grub2/grub.cfg b/toolkit/tools/internal/resources/assets/grub2/grub.cfg index 7156a96039e..78298a98c10 100644 --- a/toolkit/tools/internal/resources/assets/grub2/grub.cfg +++ b/toolkit/tools/internal/resources/assets/grub2/grub.cfg @@ -18,7 +18,7 @@ fi set rootdevice={{.RootPartition}} -menuentry "CBL-Mariner" { +menuentry "Azure Linux" { linux $bootprefix/$mariner_linux {{.LuksUUID}} {{.LVM}} {{.IMAPolicy}} {{.ReadOnlyVerityRoot}} {{.SELinux}} {{.FIPS}} rd.auto=1 root=$rootdevice $mariner_cmdline lockdown=integrity sysctl.kernel.unprivileged_bpf_disabled=1 $systemd_cmdline {{.CGroup}} {{.ExtraCommandLine}} $kernelopts if [ -f $bootprefix/$mariner_initrd ]; then initrd $bootprefix/$mariner_initrd diff --git a/toolkit/tools/internal/rpm/rpm.go b/toolkit/tools/internal/rpm/rpm.go index cecebc022a4..e5a3532530b 100644 --- a/toolkit/tools/internal/rpm/rpm.go +++ b/toolkit/tools/internal/rpm/rpm.go @@ -52,11 +52,11 @@ const ( // NoCompatibleArchError specifies the error message when processing a SPEC written for a different architecture. NoCompatibleArchError = "error: No compatible architectures found for build" - // MarinerModuleLdflagsDefine specifies the variable used to enable linking ELF binaries with module_info.ld metadata. - MarinerModuleLdflagsDefine = "distro_module_ldflags " + // Azure LinuxModuleLdflagsDefine specifies the variable used to enable linking ELF binaries with module_info.ld metadata. + AzureLinuxModuleLdflagsDefine = "distro_module_ldflags " - // MarinerCCacheDefine enables ccache in the Mariner build system - MarinerCCacheDefine = "ccache_enabled" + // Azure LinuxCCacheDefine enables ccache in the Azure Linux build system + AzureLinuxCCacheDefine = "ccache_enabled" // MaxCPUDefine specifies the max number of CPUs to use for parallel build MaxCPUDefine = "_smp_ncpus_max" @@ -92,7 +92,7 @@ var ( installedRPMRegex = regexp.MustCompile(`^D: =+ \+{3} (\S+) (\S+)-linux.*$`) // For most use-cases, the distro name abbreviation and major version are set by the exe package. However, if the - // module is used outside of the main Mariner build system, the caller can override these values with SetDistroMacros(). + // module is used outside of the main Azure Linux build system, the caller can override these values with SetDistroMacros(). distNameAbreviation, distMajorVersion = loadLdDistroFlags() ) diff --git a/toolkit/tools/internal/rpm/testdata/supported_unsupported_architectures.spec b/toolkit/tools/internal/rpm/testdata/supported_unsupported_architectures.spec index 612828728da..f130eaf4cff 100644 --- a/toolkit/tools/internal/rpm/testdata/supported_unsupported_architectures.spec +++ b/toolkit/tools/internal/rpm/testdata/supported_unsupported_architectures.spec @@ -10,14 +10,14 @@ Distribution: Azure Linux BuildArch: noarch -# Must contain only architectures not supported by CBL-Mariner! +# Must contain only architectures not supported by Azure Linux! ExcludeArch: i686 -# Must contain an architecture for each of the supported builds of CBL-Mariner! +# Must contain an architecture for each of the supported builds of Azure Linux! ExclusiveArch: x86_64 aarch64 %description -Test spec. Make sure "ExclusiveArch" contains an entry for each architecture supported by CBL-Mariner! +Test spec. Make sure "ExclusiveArch" contains an entry for each architecture supported by Azure Linux! %prep diff --git a/toolkit/tools/internal/rpm/testdata/unsupported_architectures.spec b/toolkit/tools/internal/rpm/testdata/unsupported_architectures.spec index 25860ced859..b1abc3d8907 100644 --- a/toolkit/tools/internal/rpm/testdata/unsupported_architectures.spec +++ b/toolkit/tools/internal/rpm/testdata/unsupported_architectures.spec @@ -10,14 +10,14 @@ Distribution: Azure Linux BuildArch: noarch -# Must contain an architecture for each of the supported builds of CBL-Mariner! +# Must contain an architecture for each of the supported builds of Azure Linux! ExcludeArch: x86_64 aarch64 -# Must contain only architectures not supported by CBL-Mariner! +# Must contain only architectures not supported by Azure Linux! ExclusiveArch: i686 %description -Test spec. Make sure "ExclusiveArch" contains an architecture not supported by CBL-Mariner! +Test spec. Make sure "ExclusiveArch" contains an architecture not supported by Azure Linux! %prep diff --git a/toolkit/tools/internal/tdnf/tdnf.go b/toolkit/tools/internal/tdnf/tdnf.go index f9e900bf206..b1df3d9611a 100644 --- a/toolkit/tools/internal/tdnf/tdnf.go +++ b/toolkit/tools/internal/tdnf/tdnf.go @@ -85,7 +85,7 @@ var ( // separated by a dot. // // Limiting this to digits only is a normative limitation based on past versioning - // of Mariner and its repositories. + // of Azure Linux and its repositories. // // Examples: "1.0", "2.0", "3.0" majorVersionRegex = regexp.MustCompile(`^(\d+\.\d+)(\..+)?$`) @@ -96,7 +96,7 @@ var ( ) // GetReleaseverCliArg returns a TDNF CLI argument suitable for resolving the `$releasever` variable in -// Mariner's RPM repo files to the major version of the toolkit. This argument allows TDNF to resolve +// Azure Linux's RPM repo files to the major version of the toolkit. This argument allows TDNF to resolve // without the presence of the `azurelinux-release` package. func GetReleaseverCliArg() (arg string, err error) { if releaseverArgumentPopulatedCache == "" { @@ -118,7 +118,7 @@ func GetReleaseverCliArg() (arg string, err error) { // `ToolkitVersion` string. func getMajorVersionFromToolkitVersion() (arg string, err error) { if exe.ToolkitVersion == "" { - err = fmt.Errorf("failed to get Mariner major version- toolkit version not set in exe package at link-time") + err = fmt.Errorf("failed to get Azure Linux major version- toolkit version not set in exe package at link-time") return } arg, err = getMajorVersionFromString(exe.ToolkitVersion) @@ -129,7 +129,7 @@ func getMajorVersionFromToolkitVersion() (arg string, err error) { // Specifically, we look for the first submatch in the input string using `majorVersionRegex`. func getMajorVersionFromString(version string) (majorVersion string, err error) { const ( - errorFormatString = "failed to extract major Mariner version from the following string: %s" + errorFormatString = "failed to extract major Azure Linux version from the following string: %s" ) matches := majorVersionRegex.FindStringSubmatch(version) diff --git a/toolkit/tools/internal/userutils/userutils.go b/toolkit/tools/internal/userutils/userutils.go index 307b0abe49c..0705d24a52d 100644 --- a/toolkit/tools/internal/userutils/userutils.go +++ b/toolkit/tools/internal/userutils/userutils.go @@ -96,7 +96,7 @@ func UpdateUserPassword(installRoot, username, hashedPassword string) error { // In the /etc/shadow file, the values `*` and `!` both mean the user's password login is disabled but the user // may login using other means (e.g. ssh, auto-login, etc.). This interpretation is also used by PAM. When sshd // has `UsePAM` set to `yes`, then sshd defers to PAM the decision on whether or not the user is disabled. - // However, when `UsePAM` is set to `no`, then sshd must make this interpretation for itself. And the Mariner + // However, when `UsePAM` is set to `no`, then sshd must make this interpretation for itself. And the Azure Linux // build of sshd is configured to interpret the `!` in the shadow file to mean the user is fully disabled, even // for ssh login. But it interprets `*` to mean that only password login is disabled but sshd public/private key // login is fine. diff --git a/toolkit/tools/liveinstaller/liveinstaller.go b/toolkit/tools/liveinstaller/liveinstaller.go index df0db541b47..06f11c165ab 100644 --- a/toolkit/tools/liveinstaller/liveinstaller.go +++ b/toolkit/tools/liveinstaller/liveinstaller.go @@ -142,7 +142,7 @@ func updateBootOrder(installDetails installationDetails) (err error) { return } - err = removeOldMarinerBootTargets() + err = removeOldAzureLinuxBootTargets() if err != nil { return } @@ -167,22 +167,22 @@ func runBootEntryCreationCommand(installDetails installationDetails) (err error) "-d", bootDisk.TargetDisk.Value, // Specify which disk the boot file is on "-p", fmt.Sprintf("%d", bootPartIdx+1), // Specify which partition the boot file is on "-l", "'\\EFI\\BOOT\\bootx64.efi'", // Specify the path for where the boot file is located on the partition - "-L", "Mariner", // Specify what label you would like to give this boot entry + "-L", "Azure Linux", // Specify what label you would like to give this boot entry "-v", // Be verbose } err = shell.ExecuteLive(squashErrors, program, commandArgs...) return } -func removeOldMarinerBootTargets() (err error) { +func removeOldAzureLinuxBootTargets() (err error) { const squashErrors = false - logger.Log.Info("Removing pre-existing 'Mariner' boot targets from efibootmgr") + logger.Log.Info("Removing pre-existing 'Azure Linux' boot targets from efibootmgr") program := "efibootmgr" // Default behavior when piped or called without options is to print current boot order in a human-readable format commandArgs := []string{ - "|", "grep", "\"Mariner\"", // Filter boot order for Mariner boot targets - "|", "sed", "'s/* Mariner//g'", // Pruning for just the bootnum + "|", "grep", "\"Azure Linux\"", // Filter boot order for Azure Linux boot targets + "|", "sed", "'s/* Azure Linux//g'", // Pruning for just the bootnum "|", "sed", "'s/Boot*//g'", // Pruning for just the bootnum - "|", "xargs", "-t", "-i", "efibootmgr", "-b", "{}", "-B", // Calling efibootmgr --delete-bootnum (aka `-B`) on each pre-existing bootnum with a Mariner label + "|", "xargs", "-t", "-i", "efibootmgr", "-b", "{}", "-B", // Calling efibootmgr --delete-bootnum (aka `-B`) on each pre-existing bootnum with an Azure Linux label } err = shell.ExecuteLive(squashErrors, program, commandArgs...) return diff --git a/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer.go b/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer.go index a27f5c043b8..f2b482199da 100644 --- a/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer.go +++ b/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer.go @@ -38,7 +38,7 @@ const ( ) var ( - // Version specifies the version of the Mariner Image Customizer tool. + // Version specifies the version of the Azure Linux Image Customizer tool. // The value of this string is inserted during compilation via a linker flag. ToolVersion = "" ) diff --git a/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer_test.go b/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer_test.go index b5a6f4ac76a..76cd9ef3ef9 100644 --- a/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer_test.go +++ b/toolkit/tools/pkg/imagecustomizerlib/imagecustomizer_test.go @@ -274,7 +274,7 @@ func createFakeEfiImage(buildDir string) (string, error) { return "", fmt.Errorf("failed to make build directory (%s):\n%w", buildDir, err) } - // Use a prototypical Mariner image partition config. + // Use a prototypical Azure Linux image partition config. diskConfig := imagecustomizerapi.Disk{ PartitionTableType: imagecustomizerapi.PartitionTableTypeGpt, MaxSize: 4096, diff --git a/toolkit/tools/pkg/isomakerlib/isomaker.go b/toolkit/tools/pkg/isomakerlib/isomaker.go index 870224066e7..84625c8762d 100644 --- a/toolkit/tools/pkg/isomakerlib/isomaker.go +++ b/toolkit/tools/pkg/isomakerlib/isomaker.go @@ -46,7 +46,7 @@ type IsoMaker struct { initrdPath string // Path to ISO's initrd file. grubCfgPath string // Path to ISO's grub.cfg file. If provided, overrides the grub.cfg from the resourcesDirPath location. outputDirPath string // Path to the output ISO directory. - releaseVersion string // Current Mariner release version. + releaseVersion string // Current Azure Linux release version. resourcesDirPath string // Path to the 'resources' directory. additionalIsoFiles []safechroot.FileToCopy // Additional files to copy to the ISO media (absolute-source-path -> iso-root-relative-path). imageNameBase string // Base name of the ISO to generate (no path, and no file extension). @@ -466,7 +466,7 @@ func (im *IsoMaker) prepareWorkDirectory() (err error) { } // copyStaticIsoRootFiles copies architecture-independent files from the -// Mariner repo directories. +// Azure Linux repo directories. func (im *IsoMaker) copyStaticIsoRootFiles() (err error) { if im.resourcesDirPath == "" && im.grubCfgPath == "" { diff --git a/toolkit/tools/pkggen/worker/create_worker_chroot.sh b/toolkit/tools/pkggen/worker/create_worker_chroot.sh index 19370741d15..67ec391e39d 100755 --- a/toolkit/tools/pkggen/worker/create_worker_chroot.sh +++ b/toolkit/tools/pkggen/worker/create_worker_chroot.sh @@ -79,7 +79,7 @@ while read -r package || [ -n "$package" ]; do install_one_toolchain_rpm "$package" done < "$packages" -# If the host machine rpm version is >= 4.16 (such as Mariner 2.0), it will create an "sqlite" rpm database backend incompatible with Mariner 1.0 (which uses "bdb") +# If the host machine rpm version is >= 4.16 (such as Mariner 2.0 or Azure Linux 3.0), it will create an "sqlite" rpm database backend incompatible with Azure Linux 1.0 (which uses "bdb") # To resolve this, enter the 1.0 chroot after the packages are installed, and use the older rpm tool in the chroot to re-create the database in "bdb" format. HOST_RPM_VERSION="$(rpm --version)" HOST_RPM_DB_BACKEND="$(rpm -E '%{_db_backend}')" diff --git a/toolkit/tools/pkgworker/pkgworker.go b/toolkit/tools/pkgworker/pkgworker.go index 42965c6469b..b8a1585063e 100644 --- a/toolkit/tools/pkgworker/pkgworker.go +++ b/toolkit/tools/pkgworker/pkgworker.go @@ -87,7 +87,7 @@ func main() { defines := rpm.DefaultDistroDefines(*runCheck, *distTag) defines[rpm.DistroReleaseVersionDefine] = *distroReleaseVersion defines[rpm.DistroBuildNumberDefine] = *distroBuildNumber - defines[rpm.MarinerModuleLdflagsDefine] = "-Wl,-dT,%{_topdir}/BUILD/module_info.ld" + defines[rpm.AzureLinuxModuleLdflagsDefine] = "-Wl,-dT,%{_topdir}/BUILD/module_info.ld" ccacheManager, ccacheErr := ccachemanager.CreateManager(*ccacheRootDir, *ccachConfig) if ccacheErr == nil { @@ -97,7 +97,7 @@ func main() { ccacheErr = ccacheManager.SetCurrentPkgGroup(*basePackageName, buildArch) if ccacheErr == nil { if ccacheManager.CurrentPkgGroup.Enabled { - defines[rpm.MarinerCCacheDefine] = "true" + defines[rpm.AzureLinuxCCacheDefine] = "true" } } else { logger.Log.Warnf("Failed to set package ccache configuration:\n%v", ccacheErr) diff --git a/toolkit/tools/scheduler/scheduler.go b/toolkit/tools/scheduler/scheduler.go index 8eec36b0fe7..8a7d1a89845 100644 --- a/toolkit/tools/scheduler/scheduler.go +++ b/toolkit/tools/scheduler/scheduler.go @@ -63,7 +63,7 @@ var ( rpmDir = app.Flag("rpm-dir", "The directory to use as the local repo and to submit RPM packages to").Required().ExistingDir() toolchainDirPath = app.Flag("toolchain-rpms-dir", "Directory that contains already built toolchain RPMs. Should contain top level directories for architecture.").Required().ExistingDir() srpmDir = app.Flag("srpm-dir", "The output directory for source RPM packages").Required().String() - cacheDir = app.Flag("cache-dir", "The cache directory containing downloaded dependency RPMS from Mariner Base").Required().ExistingDir() + cacheDir = app.Flag("cache-dir", "The cache directory containing downloaded dependency RPMS from Azure Linux Base").Required().ExistingDir() buildLogsDir = app.Flag("build-logs-dir", "Directory to store package build logs").Required().ExistingDir() imageConfig = app.Flag("image-config-file", "Optional image config file to extract a package list from.").String()