| make-rules/ips.mk | ●●●●● patch | view | raw | blame | history | |
| make-rules/makemaker.mk | ●●●●● patch | view | raw | blame | history | |
| tools/perl-meta-deps | ●●●●● patch | view | raw | blame | history | |
| tools/perl-version-convert | ●●●●● patch | view | raw | blame | history |
make-rules/ips.mk
@@ -238,6 +238,8 @@ PERLV_FMRI_VERSION = PLV PERLV_MANIFESTS = $(foreach v,$(PERLV_VALUES),$(shell echo $(PERL_MANIFESTS) | sed -e 's/-PERLVER.p5m/-$(v).p5m/g')) PERLNV_MANIFESTS = $(shell echo $(PERL_MANIFESTS) | sed -e 's/-PERLVER//') # Convert REQUIRED_PACKAGES to PERL_REQUIRED_PACKAGES where appropriate REQUIRED_PACKAGES_TRANSFORM += $(foreach v,$(PERLV_VALUES) $$(PLV), -e 's/^\(.*\)-$(v)$$/PERL_\1/g') else NOPERL_MANIFESTS = $(NOPY_MANIFESTS) endif @@ -298,6 +300,10 @@ sample-manifest: $(GENERATED).p5m # By default GENERATE_EXTRA_CMD is a no-op. # Since it is used in pipeline it needs to copy input to output. GENERATE_EXTRA_CMD ?= $(CAT) $(GENERATED).p5m: install [ ! -d $(SAMPLE_MANIFEST_DIR) ] && $(MKDIR) $(SAMPLE_MANIFEST_DIR) || true $(PKGSEND) generate $(PKG_HARDLINKS:%=--target %) $(PROTO_DIR) | \ @@ -308,6 +314,7 @@ $(PKGFMT) | \ uniq | \ cat $(METADATA_TEMPLATE) - | \ $(GENERATE_EXTRA_CMD) | \ $(TEE) $@ $(SAMPLE_MANIFEST_FILE) >/dev/null if [ "$(GENERATE_GENERIC_TRANSFORMS)X" != "X" ]; \ then sed $(GENERATE_GENERIC_TRANSFORMS) $(SAMPLE_MANIFEST_FILE) \ @@ -504,7 +511,7 @@ $(TOUCH) $@ # Set REQUIRED_PACKAGES macro substitution rules REQUIRED_PACKAGES_TRANSFORM=$(foreach p,$(REQUIRED_PACKAGES_SUBST), -e 's|$($(p))|$$($(p))|') REQUIRED_PACKAGES_TRANSFORM += $(foreach p,$(REQUIRED_PACKAGES_SUBST), -e 's|$($(p))|$$($(p))|') # # Generate a set of REQUIRED_PACKAGES based on what is needed for pkgdepend to @@ -512,11 +519,11 @@ # truly lazy among us. This is only a piece of the REQUIRED_PACKAGES puzzle. # You must still include packages for tools you build and test with. # REQUIRED_PACKAGES:: $(RESOLVED) REQUIRED_PACKAGES:: $(RESOLVED) $(REQUIRED_PACKAGES_RESOLVED) $(GMAKE) RESOLVE_DEPS= $(BUILD_DIR)/.resolved-$(MACH) @$(GSED) -i -e '/^# Auto-generated dependencies$$/,$$d' Makefile @echo "# Auto-generated dependencies" >>Makefile @$(PKGMOGRIFY) $(WS_TRANSFORMS)/$@ $(RESOLVED) | \ @$(PKGMOGRIFY) $(WS_TRANSFORMS)/$@ $(RESOLVED) $(REQUIRED_PACKAGES_RESOLVED) | \ $(GSED) -e '/^[\t ]*$$/d' -e '/^#/d' $(REQUIRED_PACKAGES_TRANSFORM) \ | sort -u >>Makefile @echo "*** Please edit your Makefile and verify the new or updated content at the end ***" make-rules/makemaker.mk
@@ -177,6 +177,22 @@ $(COMPONENT_TEST_CLEANUP) $(TOUCH) $@ # We need to add -$(PLV) to package fmri and generate runtime dependencies based on META.json GENERATE_EXTRA_CMD ?= \ $(GSED) -e 's/^\(set name=pkg.fmri [^@]*\)\(.*\)$$/\1-$$(PLV)\2/' | \ $(CAT) - <([ -f $(SOURCE_DIR)/META.json ] && $(WS_TOOLS)/perl-meta-deps $(BUILD_DIR) runtime $(PERL_VERSION) < $(SOURCE_DIR)/META.json) # Support for adding dependencies from META.json to REQUIRED_PACKAGES REQUIRED_PACKAGES_RESOLVED += $(BUILD_DIR)/META.depend.res $(BUILD_DIR)/META.depend.res: $(SOURCE_DIR)/.prep [ -f $(SOURCE_DIR)/META.json ] && $(WS_TOOLS)/perl-meta-deps $(BUILD_DIR) $(PERL_VERSION) < $(SOURCE_DIR)/META.json > $@ $(TOUCH) $@ # perl-meta-deps requires jq USERLAND_REQUIRED_PACKAGES += text/jq ifeq ($(strip $(PARFAIT_BUILD)),yes) parfait: build else tools/perl-meta-deps
New file @@ -0,0 +1,129 @@ #! /usr/bin/ksh # # # 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 2022 Marcel Telka # function usage { [[ -n "$1" ]] && printf "ERROR: %s\n\n" "$1" printf "Usage: perl-meta-deps BUILD_DIR [runtime] PERL_VERSION\n" >&2 [[ -n "$1" ]] && exit 1 exit 0 } (($# == 0)) && usage BUILD_DIR="$1" [[ -d "$BUILD_DIR" ]] && shift || usage "BUILD_DIR does not exist" PHASES=".configure,.build,.test,.runtime" [[ "$1" == "runtime" ]] && PHASES=".runtime" && shift (($# == 0)) && usage "PERL_VERSION missing" PERLVER=$1 && shift PLV=${PERLVER//.} PERL=/usr/perl5/$PERLVER/bin/perl [[ -x "$PERL" ]] || usage "perl $PERLVER not found" PERL_ARCH=$($PERL -e 'use Config; print $Config{archname}') (($# != 0)) && usage "Too much arguments" PERL_VERSION_CONVERT="$(dirname $0)/perl-version-convert" [[ ! -x "$PERL_VERSION_CONVERT" ]] && printf "ERROR: perl-version-convert not found" && exit 1 printf "\n# Automatically generated dependencies based on distribution metadata\n" /usr/bin/jq -r '.prereqs|'"$PHASES"'|.requires|to_entries?|.[]|.key+" "+.value' | while read PREREQ VERSION ; do # Convert perl version number to pkg(5) compatible form VER=$("$PERL_VERSION_CONVERT" "$PREREQ" "$VERSION") [[ "$VER" != "0" ]] && VER="@$VER" || VER= MANIFEST="$BUILD_DIR/META-${PREREQ//::/-}" # Prepare manifest if [[ "$PREREQ" == "perl" ]] ; then # "perl" is special case cat <<#EOF > "$MANIFEST" depend fmri=__TBD type=require pkg.debug.depend.file=$PREREQ \\ pkg.debug.depend.path=usr/perl5/$PERLVER/bin EOF else cat <<#EOF > "$MANIFEST" depend fmri=__TBD type=require pkg.debug.depend.file=${PREREQ//:://}.pm \\ pkg.debug.depend.path=usr/perl5/$PERLVER/lib \\ pkg.debug.depend.path=usr/perl5/$PERLVER/lib/$PERL_ARCH \\ pkg.debug.depend.path=usr/perl5/vendor_perl/$PERLVER \\ pkg.debug.depend.path=usr/perl5/vendor_perl/$PERLVER/$PERL_ARCH EOF fi # Resolve dependency if /usr/bin/pkgdepend resolve "$MANIFEST" ; then # Modify version number to pkg(5) compatible form cat "$MANIFEST.res" | sed -e 's/@[^ ]*//g' -e 's/-'$PLV'/-$(PLV)/g' -e 's/\(fmri=[^ ]*\)/\1'$VER'/g' else printf "ERROR: Prerequisite %s not found\n" "$PREREQ" >&2 cat "$MANIFEST" fi done | /usr/bin/pkgfmt -u | uniq | ( PREV_LINE_H= PREV_FMRI= PREV_VER= PREV_LINE_T= while read LINE ; do # Copy verbatim lines without "fmri=" [[ "${LINE//*fmri=*/FMRI}" != "FMRI" ]] && printf "%s\n" "$LINE" && continue LINE_H=${LINE%%fmri=*} LINE_T=${LINE#*fmri=} FMRI=${LINE_T%% *} LINE_T=${LINE_T#* } [[ "$FMRI" == "$LINE_T" ]] && LINE_T= VER=${FMRI##*@} FMRI=${FMRI%%@*} [[ "$FMRI" == "$VER" ]] && VER= [[ -n "$VER" ]] && VER="@$VER" FMRI="fmri=$FMRI" if [[ "$PREV_LINE_H" != "$LINE_H" || "$PREV_FMRI" != "$FMRI" || "$PREV_LINE_T" != "$LINE_T" ]] ; then [[ -n "$PREV_LINE_H$PREV_FMRI$PREV_VER$PREV_LINE_T" ]] && printf "%s%s%s%s\n" "$PREV_LINE_H" "$PREV_FMRI" "$PREV_VER" "$PREV_LINE_T" PREV_LINE_H="$LINE_H" PREV_FMRI="$FMRI" PREV_VER="$VER" PREV_LINE_T="$LINE_T" continue fi # Select higher version VER1=${PREV_VER#@} VER2=${VER#@} while true ; do [[ -z "$VER1" ]] && PREV_VER="$VER" && break [[ -z "$VER2" ]] && break V1=${VER1%%.*} ; [[ "$V1" == "$VER1" ]] && VER1="$VER1." V2=${VER2%%.*} ; [[ "$V2" == "$VER2" ]] && VER2="$VER2." ((V1 < V2)) && PREV_VER="$VER" && break ((V1 > V2)) && break VER1=${VER1#*.} VER2=${VER2#*.} done done [[ -n "$PREV_LINE_H$PREV_FMRI$PREV_VER$PREV_LINE_T" ]] && printf "%s%s%s%s\n" "$PREV_LINE_H" "$PREV_FMRI" "$PREV_VER" "$PREV_LINE_T" )| /usr/bin/pkgfmt tools/perl-version-convert
New file @@ -0,0 +1,113 @@ #! /usr/bin/ksh # # # 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 2022 Marcel Telka # function usage { [[ -n "$1" ]] && printf "ERROR: %s\n\n" "$1" printf "Usage: perl-version-convert MODULE VERSION\n" >&2 [[ -n "$1" ]] && exit 1 exit 0 } (($# == 0)) && usage (($# == 1)) && usage "Missing VERSION to convert" (($# > 2)) && usage "Too much arguments" MODULE="$1" VERSION="$2" function unsupported_version { typeset -n C=$1 typeset VERSION=$2 printf "ERROR: Unsupported version format: %s\n" "$VERSION" >&2 C="UNSUPPORTED_VERSION_FORMAT_$VERSION" } function convert_version { typeset -n C=$1 typeset MODULE=$2 typeset VERSION=$3 typeset -a VER # # Handle special cases # # Notes: # # (*) The actual version format for Crypt-PBKDF2 is 0.YYDDDR (YY - # year, DDD - day in year, R - release in the day) so it had to be # converted to 0.YY.DDD.R to be more accurate, but it was already # integrated as 0.YYDDDR, so we need to follow it for now, because # 0.YY.DDD.R would be considered older than 0.YYDDDR. Possible # conversion of 0.YYDDDR to YY.DDD.R would cause problem in a case the # Crypt::PBKDF2 bump their major version. # # (*) Module-Build uses apparently version format 0.XXYY so it had to # be converted to 0.XX.YY, but it was already integrated as 0.XXYY, so # we need to follow it for now. # [[ "$MODULE" == "Crypt-PBKDF2" && "${VERSION:0:2}" == "0." ]] && ((${#VERSION} == 8)) && VER[1]=$((1${VERSION:2:6} - 1000000)) && VERSION=${VERSION:0:1} [[ "$MODULE" == "Email-Sender" && "${VERSION:0:2}" == "1." ]] && ((${#VERSION} == 8)) && VER[1]=${VERSION:2:1} && VER[2]=$((1${VERSION:3:5} - 100000)) && VERSION=${VERSION:0:1} [[ "$MODULE" == "Email-Sender" && "${VERSION:0:2}" != "0." && "${VERSION:3:2}" == "00" ]] && ((${#VERSION} == 5)) && VER[1]=${VERSION:2:1} && VERSION=${VERSION:0:1} [[ "$MODULE" == "Module-Build" ]] && ((${#VERSION} == 6)) && VER[1]=$((1${VERSION:2:4} - 10000)) && VERSION=${VERSION:0:1} [[ "$MODULE" == "Mozilla-CA" ]] && ((${#VERSION} == 8)) && VER[1]=$((1${VERSION:4:2} - 100)) && VER[2]=$((1${VERSION:6:2} - 100)) && VERSION=${VERSION:0:4} [[ "$MODULE" == "PkgConfig" && "${VERSION:4:3}" == "026" ]] && ((${#VERSION} == 7)) && VER[1]=$((1${VERSION:2:2} - 100)) && VERSION=${VERSION:0:1} C= VER[0]=${VERSION%%.*} if [[ "${VER[0]}" != "$VERSION" ]] ; then V=${VERSION#*.} # Currently we do not support underscore in version V=${V//*_*} case "$V" in ?) VER[1]=$V ;; ??) VER[1]=$((1$V - 100)) ;; ?.?) VER[1]=${V:0:1} && VER[2]=${V:2:1} ;; ???) VER[1]=$((1$V - 1000)) ;; ?.??) VER[1]=${V:0:1} && VER[2]=$((1${V:2:2} - 100)) ;; ??.?) VER[1]=$((1${V:0:2} - 100)) && VER[2]=${V:3:1} ;; ????) VER[1]=$((1${V:0:2} - 100)) && VER[2]=$((1${V:2:2} - 100)) ;; ?.????) unsupported_version C $VERSION ; return ;; ??.???) unsupported_version C $VERSION ; return ;; ???.??) unsupported_version C $VERSION ; return ;; ????.?) unsupported_version C $VERSION ; return ;; ??????) VER[1]=$((1${V:0:3} - 1000)) ; VER[2]=$((1${V:3:3} - 1000)) ;; *) unsupported_version C $VERSION ; return ;; esac fi i=0 while ((i < ${#VER[@]})) ; do ((i > 0)) && C="$C." C="$C${VER[$i]}" i=$((i + 1)) done } convert_version VER "${MODULE//::/-}" "$VERSION" printf "%s\n" "$VER"
