Skip to content
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

Jump to bottom

illumos-gate: alternate way to handle /32 packages #19419

Open
wants to merge 1 commit into
base: oi/hipster
Choose a base branch
from
+47 −42
Open

illumos-gate: alternate way to handle /32 packages #19419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions components/openindiana/illumos-gate/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions components/openindiana/illumos-gate/patches/0004-except-glib2_32.patch
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions components/openindiana/illumos-gate/patches/0005-except-net-snmp_32.patch
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions components/openindiana/illumos-gate/patches/0007-except-expat_32.patch
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions components/openindiana/illumos-gate/patches/0008-nspr_32.patch
View file
Open in desktop

This file was deleted.

46 changes: 46 additions & 0 deletions components/openindiana/illumos-gate/patches/0009-bug16879.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
commit b1a9444e1f5d06443e3976a9de97f58b87734085 (HEAD -> bug16879, governator/bug16879)
Author: Bill Sommerfeld <sommerfeld@hamachi.org>
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) \