From a36ddfe10f095cb3512919fec150fd0b4243858a Mon Sep 17 00:00:00 2001 From: Olivia Crain Date: Thu, 17 Mar 2022 12:39:45 -0700 Subject: [PATCH] toolchain: Remove alsa-lib --- toolkit/resources/manifests/package/toolchain_aarch64.txt | 3 --- toolkit/resources/manifests/package/toolchain_x86_64.txt | 3 --- toolkit/resources/manifests/package/update_manifests.sh | 1 - toolkit/scripts/toolchain/build_official_toolchain_rpms.sh | 4 +--- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index eb38b09adba..4e5103d5e69 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -1,6 +1,3 @@ -alsa-lib-1.2.6.1-1.cm2.aarch64.rpm -alsa-lib-debuginfo-1.2.6.1-1.cm2.aarch64.rpm -alsa-lib-devel-1.2.6.1-1.cm2.aarch64.rpm asciidoc-9.1.0-1.cm2.noarch.rpm audit-3.0.6-4.cm2.aarch64.rpm audit-debuginfo-3.0.6-4.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 8a5e23888dc..81f61796e10 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -1,6 +1,3 @@ -alsa-lib-1.2.6.1-1.cm2.x86_64.rpm -alsa-lib-debuginfo-1.2.6.1-1.cm2.x86_64.rpm -alsa-lib-devel-1.2.6.1-1.cm2.x86_64.rpm asciidoc-9.1.0-1.cm2.noarch.rpm audit-3.0.6-4.cm2.x86_64.rpm audit-debuginfo-3.0.6-4.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/update_manifests.sh b/toolkit/resources/manifests/package/update_manifests.sh index 04889618071..9c310f097ff 100755 --- a/toolkit/resources/manifests/package/update_manifests.sh +++ b/toolkit/resources/manifests/package/update_manifests.sh @@ -41,7 +41,6 @@ generate_toolchain () { # Remove specific packages that are not needed in pkggen_core remove_packages_for_pkggen_core () { - sed -i '/alsa-lib-/d' $TmpPkgGen sed -i '/audit-devel/d' $TmpPkgGen sed -i '/ca-certificates-legacy/d' $TmpPkgGen sed -i '/libtasn1-d/d' $TmpPkgGen diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index e4db3773023..3c973bb2a18 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -304,8 +304,6 @@ build_rpm_in_chroot_no_install zip chroot_and_install_rpms zip build_rpm_in_chroot_no_install unzip chroot_and_install_rpms unzip -build_rpm_in_chroot_no_install alsa-lib -chroot_and_install_rpms alsa-lib build_rpm_in_chroot_no_install gperf chroot_and_install_rpms gperf @@ -468,7 +466,7 @@ build_rpm_in_chroot_no_install createrepo_c build_rpm_in_chroot_no_install libsepol -audit needs: python3, krb5, swig, e2fsprogs +# audit needs: python3, krb5, swig, e2fsprogs build_rpm_in_chroot_no_install audit # rebuild pam with selinux and audit support