The NetBSD Project

CVS log for pkgsrc/mk/pkgformat/pkg/package.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk / pkgformat / pkg

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.21: download - view: text, markup, annotated - select for diffs
Wed Jan 8 10:21:47 2025 UTC (22 months, 1 week ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2026Q3-base, pkgsrc-2026Q3, pkgsrc-2026Q2-base, pkgsrc-2026Q2, pkgsrc-2026Q1-base, pkgsrc-2026Q1, pkgsrc-2025Q4-base, pkgsrc-2025Q4, pkgsrc-2025Q3-base, pkgsrc-2025Q3, pkgsrc-2025Q2-base, pkgsrc-2025Q2, pkgsrc-2025Q1-base, pkgsrc-2025Q1, HEAD
Diff to: previous 1.20: preferred, colored
Changes since revision 1.20: +7 -9 lines
mk: Move _KEEP_BIN_PKGS logic to package-install.

Having it done at the install level meant that anything that called
bin-install would go directly to package-install, and end up overwriting
package files in PACKAGES even with PKGSRC_KEEP_BIN_PKGS=no.

Have been testing this locally for around 8 months with no issues.

Revision 1.20: download - view: text, markup, annotated - select for diffs
Fri Jan 26 03:24:58 2024 UTC (2 years, 9 months ago) by riastradh
Branches: MAIN
CVS tags: pkgsrc-2024Q4-base, pkgsrc-2024Q4, pkgsrc-2024Q3-base, pkgsrc-2024Q3, pkgsrc-2024Q2-base, pkgsrc-2024Q2, pkgsrc-2024Q1-base, pkgsrc-2024Q1
Diff to: previous 1.19: preferred, colored
Changes since revision 1.19: +2 -2 lines
mk/pkgformat/pkg: Use extended `-m "OS/ARCH VER"' syntax.

Requires pkg_install>=20240125.

No change to native builds, not even the pkg_install requirement,
because this is conditional on cross builds.

Proposed on tech-pkg:
https://mail-index.netbsd.org/tech-pkg/2024/01/13/msg028825.html

Revision 1.19: download - view: text, markup, annotated - select for diffs
Tue Jun 27 10:27:21 2023 UTC (3 years, 4 months ago) by riastradh
Branches: MAIN
CVS tags: pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3
Diff to: previous 1.18: preferred, colored
Changes since revision 1.18: +2 -2 lines
Split native and cross LOCALBASE for cross-compilation.

This way, you can use an unprivileged prefix of ~/cross/pkg to
cross-compile packages that, when installed, will go in /usr/pkg.

In mk.conf:

- Set CROSS_LOCALBASE to determine the installation prefix of
  packages that you cross-compile.

- Set LOCALBASE to determine the installation prefix of native
  packages needed for cross compilation.

Both default to /usr/pkg.  Note: CROSS_LOCALBASE defaults to /usr/pkg
even if you set LOCALBASE.  Of course, if you're not cross-compiling,
this has no effect.

When cross-compiling a package:

- LOCALBASE is where cross-compiled packages will be installed.

  (`make install' will put it in ${CROSS_DESTDIR}${LOCALBASE}, of
  course, but when you later use pkg_add to install the binary
  package on the system you're compiling it for, it will go in
  ${LOCALBASE}.  And you can still set PREFIX for an individual
  package, but LOCALBASE refers to where cross-compiled packages are
  generally installed, other than the specific ones that override
  PREFIX.)

- TOOLBASE is where tool dependencies are installed and available to
  be executed at build-time.

  For example, if you have TOOL_DEPENDS on a program that is
  installed in (say) foo/bin/xyz which is not in PATH so you have to
  refer ot its full pathname, you can execute ${TOOLBASE}/foo/bin/xyz
  instead of ${LOCALBASE}/foo/bin/xyz.

I chose this split, rather than the other way around, because I
expect that references that are baked into installed packages to be
more common than references that are executed at build-time, but I
didn't do an extensive study of the matter.  I chose the name
TOOLBASE because it's where TOOL_DEPENDS go.

Revision 1.18: download - view: text, markup, annotated - select for diffs
Wed Nov 23 11:17:51 2022 UTC (3 years, 11 months ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4
Diff to: previous 1.17: preferred, colored
Changes since revision 1.17: +14 -9 lines
mk: pkgformat performance improvements.

Inline ${RUN} calls where appropriate.  Only call mkdir when necessary.
Remove useless use of cat(1).  Avoid unnecessary expr(1).  Use bmake
loop expansion.  Avoid unnecessary temporary files.

Saves around 50 execs per build.

Revision 1.17: download - view: text, markup, annotated - select for diffs
Sat Dec 11 09:01:23 2021 UTC (4 years, 11 months ago) by schmonz
Branches: MAIN
CVS tags: pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4
Diff to: previous 1.16: preferred, colored
Changes since revision 1.16: +3 -2 lines
I export pkgsrc over NFS from a macOS host to a variety of VMs, each of
which sets ${PACKAGES} to a subdir of ${PKGSRCDIR}/packages (on the same
NFS mount) so that the generated packages all land in one place.

From my Debian, Devuan, Ubuntu, and CentOS 8 (but not 7) VMs,
copying ${STAGE_PKGFILE} to ${PKGFILE} fails to preserve permissions,
which fails the copy and the "package" target with it. The error
looks like so:

===> Building binary package for foo-4.2
=> Creating binary package /home/schmonz/trees/pkgsrc-cvs/packages/Debian/All/foo-4.2.tgz
/bin/cp: preserving permissions for ‘/home/schmonz/trees/pkgsrc-cvs/packages/Debian/All/foo-4.2.tgz’: Operation not permitted

Assuming permissions on built packages are merely a nice-to-have, avoid
failing if we couldn't preserve them. Patch from sjmulder@, for whom
this fixes a similar problem with FreeBSD with ZFS.

Revision 1.16: download - view: text, markup, annotated - select for diffs
Sat Aug 19 00:30:19 2017 UTC (9 years, 2 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +5 -4 lines
Run pkg_add(1) and pkg_delete(1) using ${SETENV} ${PKGTOOLS_ENV}.

PKGTOOLS_ENV allows for passing environment variables to the
package install and deinstall scripts.

Revision 1.15: download - view: text, markup, annotated - select for diffs
Mon May 9 00:07:23 2016 UTC (10 years, 6 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +3 -28 lines
Stop creating category symlinks in ${PACKAGES}, but keep All/ for now.

Revision 1.14: download - view: text, markup, annotated - select for diffs
Sun Apr 10 15:58:03 2016 UTC (10 years, 7 months ago) by joerg
Branches: MAIN
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +4 -38 lines
Remove support for USE_DESTDIR=no.

Revision 1.13: download - view: text, markup, annotated - select for diffs
Tue Feb 2 08:15:07 2016 UTC (10 years, 9 months ago) by rillig
Branches: MAIN
CVS tags: pkgsrc-2016Q1-base, pkgsrc-2016Q1
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +2 -2 lines
Changed "Install binary package" to "Installing binary package"

Revision 1.12: download - view: text, markup, annotated - select for diffs
Thu Oct 29 20:09:28 2015 UTC (11 years ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2015Q4-base, pkgsrc-2015Q4
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +19 -17 lines
Perform signing at the staged package stage rather than only during the
copy to the target pkgfile.  Ensures consistency at all stages, means we
can support verifying the signature at install time, and also fixes signed
packages with recent pbulk changes which now invoke 'stage-package-create'
rather than 'package'.

Revision 1.11: download - view: text, markup, annotated - select for diffs
Mon Sep 7 11:02:28 2015 UTC (11 years, 2 months ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2015Q3-base, pkgsrc-2015Q3
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +3 -3 lines
Switch to globbing for package symlinks to delete.  This provides significant
performance improvements on at least OSX and SunOS, where each file is stat'd
rather than just the links we are looking for, especially with large package
directories over NFS.

Revision 1.10: download - view: text, markup, annotated - select for diffs
Tue Apr 21 17:01:56 2015 UTC (11 years, 6 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2015Q2-base, pkgsrc-2015Q2
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +2 -2 lines
Add a new ulimit modifier for cputime. Support raising limits for
package creation.

There are very few things in pkgsrc that needs more than one hour per
process on decently fast hardware, so setting that as (soft) limit for
bulk builds avoids the infinite loops seen in some other packages. There
are a few select exceptions, i.e. flightgear-data needs more than one
hour for pkg_create when using xz. This flag allows selectively giving
those places more time without wasting resources in the broken cases.

Revision 1.9: download - view: text, markup, annotated - select for diffs
Mon Feb 16 10:50:33 2015 UTC (11 years, 9 months ago) by jperkin
Branches: MAIN
CVS tags: pkgsrc-2015Q1-base, pkgsrc-2015Q1
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +1 -0 lines
Put back PKGNAME_REQD fix for su-real-package-install.

Revision 1.8: download - view: text, markup, annotated - select for diffs
Sun Feb 1 11:24:58 2015 UTC (11 years, 9 months ago) by obache
Branches: MAIN
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +1 -2 lines
Revert "Pass PKGNAME_REQD to su-real-package-install",
proposed/discussed is required for such infrastructure changes.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Tue Dec 30 15:13:20 2014 UTC (11 years, 10 months ago) by wiz
Branches: MAIN
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +1 -4 lines
Remove pkg_views support, second part: infrastructure.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Sun Dec 7 05:09:02 2014 UTC (11 years, 11 months ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2014Q4-base, pkgsrc-2014Q4
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +2 -1 lines
Pass PKGNAME_REQD to su-real-package-install, for multiversion packages
not using default version.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Mon Apr 7 05:25:03 2014 UTC (12 years, 7 months ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +3 -3 lines
Fixes undefined variable references.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Sun Apr 6 15:04:16 2014 UTC (12 years, 7 months ago) by khorben
Branches: MAIN
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +18 -3 lines
Create signed packages automatically if desired. It is disabled by default,
and documented in mk/defaults/mk.conf. Both the "gpg" and "x509" methods
supported by pkg_admin(1) are supported. With package signing enabled, a
staging, unsigned copy of the package is always created, and its final copy
to the package repository is done with pkg_admin(1) instead of "ln || cp".
Proper operation should otherwise not be affected.

Tested both with and without user-destdir support in packages.

"can live with it" joerg@

From EdgeBSD.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Sat Aug 10 06:05:57 2013 UTC (13 years, 3 months ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +2 -2 lines
drop unwanted stage-package-remove before stage-package-create,
to avoid unwanted stage binary package removal/regeneration.

Revision 1.2: download - view: text, markup, annotated - select for diffs
Thu May 23 13:18:56 2013 UTC (13 years, 5 months ago) by obache
Branches: MAIN
CVS tags: pkgsrc-2013Q2-base, pkgsrc-2013Q2
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +46 -5 lines
prevent to generate binary package in ${PACKAGES} from the side effect of
`install' with USE_DESTDIR=yes.
This changes prevent to unwanted overwite of existing binary packages with
test installation (`stage-install', `replace' & `undo-replace', and so on).

To do both `install' and `package', you can still use `package-install' target,
same as USE_DESTDIR=no.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Sat Oct 15 00:23:09 2011 UTC (15 years, 1 month ago) by reed
Branches: MAIN
CVS tags: pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4
Rename "flavor" to "pkgformat".

This is from Anton Panev's GSoC 2011 project to add RPM and DPKG
support to pkgsrc. (I am not adding that further support in this
commit.)

This is just a rename of the existing functionality. Now it will
be easy to test the GSoC work by simply putting in a single
directory (such as "rpm" or "deb"). See
http://addpackageforma.sourceforge.net/ for some details.

This is from Anton's CVS, but I made some minor changes:

- changed plural pkgformats to singular pkgformat (to be consistent)

- fixed a few places (in comments) that were missed

- catch up on some additions to flavor not in the pkgforma cvs:
PKGSRC_SETENV and _flavor-destdir-undo-replace and
undo-destdir-replace-install.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>