Skip to content

Merge 3.0 branch changes to main branch #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Merge 3.0 branch changes to main branch #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e379a9
Update uefi-bootloader-packages.json for azl3
nicogbg Mar 25, 2024
b152099
Update hello_world_demo.spec
nicogbg Mar 26, 2024
e1f1017
Update core-packages.json (#60)
anphel31 Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SPECS/hello_world_demo/hello_world_demo.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Distribution: Mariner
Source0: http://dev.azure.com/mariner-org/mariner/_git/samples/%{name}-%{version}.tar.gz

BuildRequires: gcc
# add non toolchain pkg as build requires (for testing purpose)
BuildRequires: words

%description
A simple hello-world application
Expand Down
1 change: 1 addition & 0 deletions imageconfigs/demo_package_lists/core-packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"packages": [
"core-packages-base-image",
"shadow-utils",
"initramfs"
],
"_comment": "Install 'initramfs' last to avoid unnecessary regeneration when other packages, such as 'kernel', are installed."
Expand Down
2 changes: 2 additions & 0 deletions imageconfigs/demo_package_lists/uefi-bootloader-packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"packages": [
"grub2-efi-binary",
"grub2",
"ca-certificates",
"shim-unsigned"
]
}