Merge branch '3.0-dev' into 3.0

Author: jslobodzian

.github/workflows/quickstart_2.0.yml

@@ -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: |
@@ -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

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -221,7 +221,6 @@
                 "facter",
                 "fakechroot",
                 "fakeroot",
-                "fdk-aac-free",
                 "fdupes",
                 "fence-virt",
                 "fetchmail",
@@ -1074,8 +1073,6 @@
                 "openssl-pkcs11",
                 "openwsman",
                 "optipng",
-                "opus",
-                "opusfile",
                 "orangefs",
                 "ORBit2",
                 "orc",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -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
@@ -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
@@ -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
@@ -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
@@ -416,6 +415,9 @@ rm %{_libexecdir}/gstreamer-%{majorminor}/gst-plugin-scanner
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jan 22 2025 Andrew Phelps <anphel@microsoft.com> - 1.20.4-3
+- Remove dependency on opus
+
 * Wed Nov 23 2022 Sumedh Sharma <sumsharma@microsoft.com> - 1.20.4-2
 - Initial CBL-Mariner import from Fedora 37 (license: MIT)
 - License verified