From 6740d78da22a79d438192698091c56a60a8be26d Mon Sep 17 00:00:00 2001 From: Bill Sommerfeld Date: Sat, 2 Nov 2024 20:48:41 -0700 Subject: [PATCH] illumos-gate: alternate approach to avoid pkglint errors for /32 packages --- components/openindiana/illumos-gate/Makefile | 1 + .../patches/0004-except-glib2_32.patch | 12 ----- .../patches/0005-except-net-snmp_32.patch | 10 ---- .../patches/0007-except-expat_32.patch | 10 ---- .../illumos-gate/patches/0008-nspr_32.patch | 10 ---- .../illumos-gate/patches/0009-bug16879.patch | 46 +++++++++++++++++++ 6 files changed, 47 insertions(+), 42 deletions(-) delete mode 100644 components/openindiana/illumos-gate/patches/0004-except-glib2_32.patch delete mode 100644 components/openindiana/illumos-gate/patches/0005-except-net-snmp_32.patch delete mode 100644 components/openindiana/illumos-gate/patches/0007-except-expat_32.patch delete mode 100644 components/openindiana/illumos-gate/patches/0008-nspr_32.patch create mode 100644 components/openindiana/illumos-gate/patches/0009-bug16879.patch diff --git a/components/openindiana/illumos-gate/Makefile b/components/openindiana/illumos-gate/Makefile index fbb256de04c..a0182aafbc4 100644 --- a/components/openindiana/illumos-gate/Makefile +++ b/components/openindiana/illumos-gate/Makefile @@ -103,6 +103,7 @@ $(BUILD_DIR)/$(MACH)/.built: $(SOURCE_DIR)/.patched $(BUILD_DIR)/runtime-perl.p5 echo export DEP_RUNTIME_PERL="$(BUILD_DIR)/runtime-perl.p5m"; \ echo export BUILDPERL32=\"#\"; \ echo export PKGVERS_BRANCH=$(ONNV_BUILDNUM); \ + echo export PKGEXTRASUFFIX=/32; \ echo export BOOTBANNER1=\"$(DISTRIBUTION_NAME) $(DISTRIBUTION_VERSION) Version ^v ^w-bit\") > \ illumos.sh && \ time $(ENV) ./usr/src/tools/scripts/nightly -V $(shell cd $(SOURCE_DIR) && git log -1 --format=illumos-%h) illumos.sh diff --git a/components/openindiana/illumos-gate/patches/0004-except-glib2_32.patch b/components/openindiana/illumos-gate/patches/0004-except-glib2_32.patch deleted file mode 100644 index 37a73fac0d9..00000000000 --- a/components/openindiana/illumos-gate/patches/0004-except-glib2_32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/exception_lists/packaging.deps b/exception_lists/packaging.deps -index 6aee0aac35..620b8f27f7 100644 ---- a/exception_lists/packaging.deps -+++ b/exception_lists/packaging.deps -@@ -11,6 +11,7 @@ pkg:/file/gnu-coreutils - pkg:/gnome/zenity - pkg:/library/expat - pkg:/library/glib2 -+pkg:/library/glib2/32 - pkg:/library/libxml2 - pkg:/library/libxml2/32 - pkg:/library/nspr diff --git a/components/openindiana/illumos-gate/patches/0005-except-net-snmp_32.patch b/components/openindiana/illumos-gate/patches/0005-except-net-snmp_32.patch deleted file mode 100644 index b0285f49240..00000000000 --- a/components/openindiana/illumos-gate/patches/0005-except-net-snmp_32.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- illumos-gate/exception_lists/packaging.deps.orig -+++ illumos-gate/exception_lists/packaging.deps -@@ -46,6 +46,7 @@ - pkg:/system/library/libdbus-glib - pkg:/system/library/mozilla-nss - pkg:/system/management/snmp/net-snmp -+pkg:/system/management/snmp/net-snmp/32 - pkg:/system/test/fio - pkg:/system/xvm/xvmstore - pkg:/text/less diff --git a/components/openindiana/illumos-gate/patches/0007-except-expat_32.patch b/components/openindiana/illumos-gate/patches/0007-except-expat_32.patch deleted file mode 100644 index d4eb4f4e9a0..00000000000 --- a/components/openindiana/illumos-gate/patches/0007-except-expat_32.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- illumos-gate/exception_lists/packaging.deps.orig -+++ illumos-gate/exception_lists/packaging.deps -@@ -10,6 +10,7 @@ - pkg:/file/gnu-coreutils - pkg:/gnome/zenity - pkg:/library/expat -+pkg:/library/expat/32 - pkg:/library/glib2 - pkg:/library/glib2/32 - pkg:/library/libxml2 diff --git a/components/openindiana/illumos-gate/patches/0008-nspr_32.patch b/components/openindiana/illumos-gate/patches/0008-nspr_32.patch deleted file mode 100644 index 61078a32801..00000000000 --- a/components/openindiana/illumos-gate/patches/0008-nspr_32.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- illumos-gate/exception_lists/packaging.deps.orig -+++ illumos-gate/exception_lists/packaging.deps -@@ -16,6 +16,7 @@ - pkg:/library/libxml2 - pkg:/library/libxml2/32 - pkg:/library/nspr -+pkg:/library/nspr/32 - pkg:/library/security/openssl - pkg:/library/security/openssl-10 - pkg:/library/security/openssl-11 diff --git a/components/openindiana/illumos-gate/patches/0009-bug16879.patch b/components/openindiana/illumos-gate/patches/0009-bug16879.patch new file mode 100644 index 00000000000..82ae9c59184 --- /dev/null +++ b/components/openindiana/illumos-gate/patches/0009-bug16879.patch @@ -0,0 +1,46 @@ +commit b1a9444e1f5d06443e3976a9de97f58b87734085 (HEAD -> bug16879, governator/bug16879) +Author: Bill Sommerfeld +Date: Sat Nov 2 13:10:22 2024 -0700 + + 16879 pkglint fails on openindiana with more unexpected /32 packages + + Change-Id: I42ed338dea600ff27fa685aa743f6a972c8f07d8 + +diff --git a/exception_lists/packaging.deps b/exception_lists/packaging.deps +index 6aee0aac35..85d869f657 100644 +--- a/exception_lists/packaging.deps ++++ b/exception_lists/packaging.deps +@@ -12,7 +12,6 @@ pkg:/gnome/zenity + pkg:/library/expat + pkg:/library/glib2 + pkg:/library/libxml2 +-pkg:/library/libxml2/32 + pkg:/library/nspr + pkg:/library/security/openssl + pkg:/library/security/openssl-10 +diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile +index e58f930fc3..4f16af28ed 100644 +--- a/usr/src/pkg/Makefile ++++ b/usr/src/pkg/Makefile +@@ -49,6 +49,12 @@ SUPPRESSPKGDEP= false + # + PKGDEBUG= @ + ++# ++# If the distribution you're building on has package variants with a different ++# suffix, set this in your build environment. ++# ++PKGEXTRASUFFIX= ++ + # + # Cross platform packaging notes + # +@@ -694,6 +700,8 @@ pkglint: makesilent + $(PKGDEBUG)$(CP) etc/pkglintrc $(PDIR)/pkglintrc + $(PKGDEBUG)$(GREP) pkg:/ $(CODEMGR_WS)/exception_lists/packaging.deps \ + | sed 's/.*/ & \\/' >> $(PDIR)/pkglintrc ++ $(PKGDEBUG)$(GREP) pkg:/ $(CODEMGR_WS)/exception_lists/packaging.deps \ ++ | sed 's;.*; &$(PKGEXTRASUFFIX) \\;' >> $(PDIR)/pkglintrc + $(PKGDEBUG)echo " pkg:/runtime/python$(PYTHON3_PKGVERS) \\" \ + >> $(PDIR)/pkglintrc + $(PKGDEBUG)$(BUILDPY3b) \