Skip to content

Commit

Permalink
Merge branch '3.0-dev' into 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jslobodzian committed Jan 26, 2025
2 parents fc5b1e8 + 76dcc08 commit 6789a4d
Show file tree
Hide file tree
Showing 104 changed files with 4,003 additions and 19,738 deletions.
95 changes: 52 additions & 43 deletions .github/workflows/quickstart_2.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,55 @@
#
# Workflow to automatedly verify the quickstart instructions

name: Verify Quickstart 2.0
name: Verify Quickstart 3.0

on:
workflow_dispatch:
schedule:
- cron: "0 15 * * *"

jobs:
get_input-srpms:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: '2.0-stable'

- name: Set up Go 1.20
uses: actions/setup-go@v5
with:
go-version: 1.20
id: go

- name: Install Remaining Prerequisites
run: |
# Golang and docker are already installed on the agent
sudo apt-get update
sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
sudo apt -y install pigz
- name: Download SRPMS
run: |
pushd toolkit
sudo make go-tools REBUILD_TOOLS=y
sudo make input-srpms DOWNLOAD_SRPMS=y
popd
iso_quickstart:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: '2.0-stable'
ref: '3.0-stable'

- name: Set up Go 1.20
- name: Set up Go 1.21
uses: actions/setup-go@v5
with:
go-version: 1.20
go-version: 1.21
id: go

- name: Install Remaining Prerequisites
run: |
# Golang and docker are already installed on the agent
sudo apt-get update
sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
sudo apt -y install pigz
sudo apt -y install \
acl \
curl \
gawk \
genisoimage \
git \
golang-1.21-go \
jq \
make \
parted \
pigz \
openssl \
systemd \
qemu-utils \
rpm \
tar \
wget \
xfsprogs
# Fix go 1.21 link
sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
- name: ISO Quick Start
run: |
Expand All @@ -75,23 +66,41 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
with:
ref: '2.0-stable'
ref: '3.0-stable'

- name: Set up Go 1.20
- name: Set up Go 1.21
uses: actions/setup-go@v5
with:
go-version: 1.20
go-version: 1.21
id: go

- name: Install Remaining Prerequisites
run: |
# Golang and docker are already installed on the agent
sudo apt-get update
sudo apt -y install make tar wget curl rpm qemu-utils genisoimage python-minimal bison gawk parted
sudo apt -y install pigz
sudo apt -y install \
acl \
curl \
gawk \
genisoimage \
git \
golang-1.21-go \
jq \
make \
parted \
pigz \
openssl \
systemd \
qemu-utils \
rpm \
tar \
wget \
xfsprogs
# Fix go 1.21 link
sudo ln -vsf /usr/lib/go-1.21/bin/go /usr/bin/go
sudo ln -vsf /usr/lib/go-1.21/bin/gofmt /usr/bin/gofmt
- name: VHDX Quick Start
run: |
pushd toolkit
sudo make image REBUILD_TOOLS=y REBUILD_PACKAGES=n CONFIG_FILE=./imageconfigs/core-efi.json
popd
popd
2 changes: 1 addition & 1 deletion LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions LICENSES-AND-NOTICES/SPECS/data/licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@
"facter",
"fakechroot",
"fakeroot",
"fdk-aac-free",
"fdupes",
"fence-virt",
"fetchmail",
Expand Down Expand Up @@ -1074,8 +1073,6 @@
"openssl-pkcs11",
"openwsman",
"optipng",
"opus",
"opusfile",
"orangefs",
"ORBit2",
"orc",
Expand Down
5 changes: 0 additions & 5 deletions SPECS-EXTENDED/fdk-aac-free/fdk-aac-free.signatures.json

This file was deleted.

113 changes: 0 additions & 113 deletions SPECS-EXTENDED/fdk-aac-free/fdk-aac-free.spec

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Summary: GStreamer streaming media framework base plugins
Name: gstreamer1-plugins-base
Version: 1.20.0
Release: 2%{?dist}
Release: 3%{?dist}
License: LGPLv2+
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand All @@ -26,7 +26,6 @@ BuildRequires: libXv-devel
BuildRequires: orc-devel >= 0.4.18
BuildRequires: pango-devel
BuildRequires: pkgconfig
BuildRequires: opus-devel
BuildRequires: gdk-pixbuf2-devel
BuildRequires: gtk3-devel
BuildRequires: libjpeg-turbo-devel
Expand Down Expand Up @@ -93,7 +92,8 @@ for developing applications that use %{name}.
-D orc=enabled \
-D tremor=disabled \
-D tests=disabled \
-D examples=disabled
-D examples=disabled \
-D opus=disabled
%meson_build

%install
Expand Down Expand Up @@ -222,7 +222,6 @@ rm %{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
%{_libdir}/gstreamer-%{majorminor}/libgstopengl.so
%{_libdir}/gstreamer-%{majorminor}/libgstlibvisual.so
%{_libdir}/gstreamer-%{majorminor}/libgstogg.so
%{_libdir}/gstreamer-%{majorminor}/libgstopus.so
%{_libdir}/gstreamer-%{majorminor}/libgstpango.so
%{_libdir}/gstreamer-%{majorminor}/libgsttheora.so
%{_libdir}/gstreamer-%{majorminor}/libgstvorbis.so
Expand Down Expand Up @@ -416,6 +415,9 @@ rm %{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
%{_libdir}/pkgconfig/*.pc

%changelog
* Wed Jan 22 2025 Andrew Phelps <[email protected]> - 1.20.4-3
- Remove dependency on opus

* Wed Nov 23 2022 Sumedh Sharma <[email protected]> - 1.20.4-2
- Initial CBL-Mariner import from Fedora 37 (license: MIT)
- License verified
Expand Down
7 changes: 0 additions & 7 deletions SPECS-EXTENDED/opus/opus.signatures.json

This file was deleted.

Loading

0 comments on commit 6789a4d

Please sign in to comment.