-
Notifications
You must be signed in to change notification settings - Fork 188
Forge base commit #24028
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.
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
base: oi/hipster
Are you sure you want to change the base?
Forge base commit #24028
Changes from all commits
985bdc3
0f5ea36
7f8bc90
e4fc19b
3698397
4caca6b
efa4e09
7ce520d
be3db49
5a2d331
a9d8d8f
9aacbc0
c52ba12
76b8b70
012c09d
3613639
60868a7
c520c9e
8e04bce
8996eec
b855721
a80fccf
4c1e2bd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| # | ||
| # This file and its contents are supplied under the terms of the | ||
| # Common Development and Distribution License ("CDDL"), version 1.0. | ||
| # You may only use this file in accordance with the terms of version | ||
| # 1.0 of the CDDL. | ||
| # | ||
| # A full copy of the text of the CDDL should have accompanied this | ||
| # source. A copy of the CDDL is also available via the Internet at | ||
| # http://www.illumos.org/license/CDDL. | ||
| # | ||
| # | ||
| # Copyright 2023 Till Wegmueller | ||
| # | ||
|
|
||
| # Allow overriding via environment and default to relying on PATH | ||
| PKGDEV ?= pkgdev | ||
|
|
||
| # Ensure Cargo-installed tools (e.g., pkgdev) are on PATH | ||
| PATH := $(PATH):$(HOME)/.cargo/bin | ||
| export PATH | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since you include this file from |
||
|
|
||
| .PHONY: generate-package-kdl | ||
|
|
||
| # Generate package.kdl using pkgdev with component metadata | ||
| generate-package-kdl: | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we need an unusable target? I'm sorry, but this makes no sense. Please postpone this change once we do have the |
||
| @compname="$(COMPONENT_NAME)"; \ | ||
| [ -z "$$compname" ] && compname="$$(/usr/bin/basename "$$PWD")"; \ | ||
| if [ -f "package.kdl" ]; then \ | ||
| echo "Skipping package.kdl generation for $$compname: package.kdl already exists"; \ | ||
| exit 0; \ | ||
| fi; \ | ||
| missing=""; \ | ||
| [ -z "$(COMPONENT_NAME)" ] && missing="$$missing COMPONENT_NAME"; \ | ||
| [ -z "$(COMPONENT_FMRI)" ] && missing="$$missing COMPONENT_FMRI"; \ | ||
| [ -z "$(COMPONENT_SUMMARY)" ] && missing="$$missing COMPONENT_SUMMARY"; \ | ||
| [ -z "$(COMPONENT_CLASSIFICATION)" ] && missing="$$missing COMPONENT_CLASSIFICATION"; \ | ||
| [ -z "$(COMPONENT_LICENSE)" ] && missing="$$missing COMPONENT_LICENSE"; \ | ||
| [ -z "$(COMPONENT_LICENSE_FILE)" ] && missing="$$missing COMPONENT_LICENSE_FILE"; \ | ||
| [ -z "$(COMPONENT_VERSION)" ] && missing="$$missing COMPONENT_VERSION"; \ | ||
| [ -z "$(COMPONENT_PROJECT_URL)" ] && missing="$$missing COMPONENT_PROJECT_URL"; \ | ||
| [ -z "$(COMPONENT_ARCHIVE_URL)" ] && missing="$$missing COMPONENT_ARCHIVE_URL"; \ | ||
| [ -z "$(COMPONENT_ARCHIVE_HASH)" ] && missing="$$missing COMPONENT_ARCHIVE_HASH"; \ | ||
| if [ -n "$$missing" ]; then \ | ||
| echo "Skipping package.kdl generation for $$compname: missing variables:$$missing"; \ | ||
| if [ -n "$(WS_TOP)" ]; then echo "$$compname" >> "$(WS_TOP)/components.missing-metadata"; fi; \ | ||
| exit 0; \ | ||
| else \ | ||
| echo "generating package.kdl for $$compname"; \ | ||
| $(PKGDEV) create $(COMPONENT_FMRI); \ | ||
| for package in $(REQUIRED_PACKAGES) ; do \ | ||
| $(PKGDEV) edit add dependency --dev --kind require $$package ; \ | ||
| done; \ | ||
| $(PKGDEV) edit set project-name "$(COMPONENT_NAME)"; \ | ||
| $(PKGDEV) edit set summary "$(COMPONENT_SUMMARY)"; \ | ||
| $(PKGDEV) edit set classification "$(COMPONENT_CLASSIFICATION)"; \ | ||
| $(PKGDEV) edit set license "$(COMPONENT_LICENSE)" -f "$(COMPONENT_LICENSE_FILE)"; \ | ||
| $(PKGDEV) edit set version "$(COMPONENT_VERSION)"; \ | ||
| $(PKGDEV) edit set project-url "$(COMPONENT_PROJECT_URL)"; \ | ||
| $(PKGDEV) edit add source archive "$(COMPONENT_ARCHIVE_URL)" "$(COMPONENT_ARCHIVE_HASH)"; \ | ||
| if [ -d "patches" ]; then $(PKGDEV) edit add source patch patches; fi; \ | ||
| if [ "$(strip $(BUILD_STYLE))" = "configure" ]; then \ | ||
| $(PKGDEV) edit add build --gate $(WS_TOP)/userland-gate.kdl configure $(foreach var,$(CONFIGURE_OPTIONS),"$(var)"); \ | ||
| fi; \ | ||
| fi | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| name "userland" | ||
| version "0.5.11" | ||
| branch "2025.0.0" | ||
| publisher "openindiana.org" | ||
|
|
||
| metadata-transform matcher="--libexecdir" replacement="--libexecdir=${LIBEXECDIR}" | ||
| metadata-transform matcher="--bindir" replacement="--bindir=${BINDIR}" | ||
| metadata-transform matcher="--sbindir" replacement="--sbindir=${SBINDIR}" | ||
| metadata-transform matcher="--mandir" replacement="--mandir=${MANDIR}" | ||
| metadata-transform matcher="--libdir" replacement="--libdir=${LIBDIR}" | ||
| metadata-transform matcher="--with-jobs" drop=true | ||
| metadata-transform matcher="CC" drop=true | ||
| metadata-transform matcher="CXX" drop=true | ||
| metadata-transform matcher="F77" drop=true | ||
| metadata-transform matcher="FC" drop=true | ||
| metadata-transform matcher="FFLAGS" drop=true | ||
| metadata-transform matcher="CFLAGS" drop=true | ||
| metadata-transform matcher="LDFLAGS" drop=true | ||
| metadata-transform matcher="PKG_CONFIG_PATH" drop=true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.