From 92e0a6e95d335e7a1ea48b691d26de16e0f2c0a6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Thu, 4 Apr 2024 19:43:21 -0300 Subject: [PATCH] qi: Bump to release 2.12 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- qi/Makefile | 18 +- qi/NEWS | 17 +- qi/configure | 73 ++++-- qi/doc/qi-header.texi | 8 +- qi/doc/qi.1 | 2 +- qi/doc/qi.html | 306 ++++++++++++++---------- qi/doc/qi.info | 488 +++++++++++++++++++------------------- qi/etc/qirc.in | 8 +- qi/src/qi.in | 52 ++-- recipes/tools/qi/recipe | 10 +- sources/SOURCELIST.txt | 2 +- sources/qi-2.12-rc2.tar.lz.sha256 | 1 - sources/qi-2.12.tar.lz.sha256 | 1 + stages/1/17-qi | 58 ++--- 14 files changed, 574 insertions(+), 470 deletions(-) delete mode 100644 sources/qi-2.12-rc2.tar.lz.sha256 create mode 100644 sources/qi-2.12.tar.lz.sha256 diff --git a/qi/Makefile b/qi/Makefile index 0ec61812..4401611c 100644 --- a/qi/Makefile +++ b/qi/Makefile @@ -1,6 +1,6 @@ # Makefile for Qi. # -# Copyright (c) 2015-2023 Matias Fonzo, . +# Copyright (c) 2015-2024 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ # limitations under the License. project = qi -version = 2.12-rc2 +version = 2.12 ## DO NOT MAKE CHANGES HERE. # @@ -35,6 +35,10 @@ arch = $(shell uname -m) packagedir = $(prefix)/pkgs targetdir = $(prefix) outdir = $(localstatedir)/cache/qi/packages +qi_cflags = -O2 +qi_cxxflags = -O2 +qi_ldflags = +qi_cppflags = ## DISTNAME = ${project}-${version} @@ -76,6 +80,10 @@ src/$(project) : src/$(project).in -e "s|@PACKAGEDIR@|$(packagedir)|g" \ -e "s|@TARGETDIR@|$(targetdir)|g" \ -e "s|@OUTDIR@|$(outdir)|g" \ + -e "s|@QICFLAGS@|$(qi_cflags)|g" \ + -e "s|@QICXXFLAGS@|$(qi_cxxflags)|g" \ + -e "s|@QILDFLAGS@|$(qi_ldflags)|g" \ + -e "s|@QICPPFLAGS@|$(qi_cppflags)|g" \ $< > $@ && \ chmod 755 $@ @@ -98,6 +106,10 @@ etc/$(project)rc : etc/$(project)rc.in -e "s|@PACKAGEDIR@|$(packagedir)|g" \ -e "s|@TARGETDIR@|$(targetdir)|g" \ -e "s|@OUTDIR@|$(outdir)|g" \ + -e "s|@QICFLAGS@|$(qi_cflags)|g" \ + -e "s|@QICXXFLAGS@|$(qi_cxxflags)|g" \ + -e "s|@QILDFLAGS@|$(qi_ldflags)|g" \ + -e "s|@QICPPFLAGS@|$(qi_cppflags)|g" \ $< > $@ && \ chmod 644 $@ @@ -206,7 +218,7 @@ install-man : @echo "* Installing manual pages on $(DESTDIR)${mandir}/man1 ..." if [ ! -d "$(DESTDIR)${mandir}/man1" ] ; then \ $(INSTALL_DIR) "$(DESTDIR)${mandir}/man1" ; \ - fi + fi $(INSTALL_DATA) doc/$(project).1 "$(DESTDIR)${mandir}/man1" diff --git a/qi/NEWS b/qi/NEWS index 9f23e459..9fbcae4b 100644 --- a/qi/NEWS +++ b/qi/NEWS @@ -1,9 +1,18 @@ -2023-??-?? Matias Fonzo +2024-04-04 Matias Fonzo - * The option (--no-rc) to override reading the configuration - file has been fixed, previously it was not working. + * Version 2.12 released. - * recipes: Sample recipes have been updated. + * The option (-N/--no-rc) to override reading the configuration + file has been fixed, previously it did not work. + + * This release introduces the ability to set the default Qi flags that + can be passed to the compiler using --qi-cflags, --qi-cxxflags, + --qi-ldflags, and --qi-cppflags via ./configure. + + * Manual encoding is now UTF-8. This is for consistency with + the new Dragora website. + + * Minor changes. 2022-12-31 Matias Fonzo diff --git a/qi/configure b/qi/configure index e7460f66..25cff491 100755 --- a/qi/configure +++ b/qi/configure @@ -2,7 +2,7 @@ # # Simple "configure" script for Qi. # -# Copyright (c) 2016-2018, 2020-2022 Matias Fonzo, . +# Copyright (c) 2016-2018, 2020-2022, 2024 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,22 +25,25 @@ usage() { Defaults for the options are specified in brackets. Options: - --prefix=DIR install files in DIR [${prefix}] - --exec-prefix=DIR base DIR for arch-dependent files [${exec_prefix}] - --bindir=DIR user executables [${bindir}] - --sbindir=DIR system admin executables [${sbindir}] - --libexecdir=DIR program executables [${libexecdir}] - --sysconfdir=DIR read-only single-machine data [${sysconfdir}] - --localstatedir=DIR modifiable single-machine data [${localstatedir}] - --datarootdir=DIR read-only arch-independent data root [${datarootdir}] - --infodir=DIR info documentation [${infodir}] - --mandir=DIR man documentation [${mandir}] - --docdir=DIR documentation root [${docdir}] - --arch=NAME architecture name to build packages [${arch}] - --packagedir=DIR directory for package installations [${packagedir}] - --targetdir=DIR target directory for symbolic links [${targetdir}] - --outdir=DIR output directory for binary packages [${outdir}] - + --prefix=DIR install files in DIR [${prefix}] + --exec-prefix=DIR base DIR for arch-dependent files [${exec_prefix}] + --bindir=DIR user executables [${bindir}] + --sbindir=DIR system admin executables [${sbindir}] + --libexecdir=DIR program executables [${libexecdir}] + --sysconfdir=DIR read-only single-machine data [${sysconfdir}] + --localstatedir=DIR modifiable single-machine data [${localstatedir}] + --datarootdir=DIR read-only arch-independent data root [${datarootdir}] + --infodir=DIR info documentation [${infodir}] + --mandir=DIR man documentation [${mandir}] + --docdir=DIR documentation root [${docdir}] + --arch=NAME architecture name to build packages [${arch}] + --packagedir=DIR directory for package installations [${packagedir}] + --targetdir=DIR target directory for symbolic links [${targetdir}] + --outdir=DIR output directory for binary packages [${outdir}] + --qi-cflags=CFLAGS default Qi C flags for compiler [${qi_cflags}] + --qi-cxxflags=CXXFLAGS default Qi C++ flags for compiler [${qi_cxxflags}] + --qi-ldflags=LDFLAGS default Qi flags for linker [${qi_ldflags}] + --qi-cppflags=CPPFLAGS default Qi C/C++ preprocessor flags [${qi_cppflags}] " } @@ -60,6 +63,10 @@ arch="$(uname -m)" packagedir='$(prefix)/pkgs' targetdir='$(prefix)' outdir='$(localstatedir)/cache/qi/packages' +qi_cflags='-O2' +qi_cxxflags='-O2' +qi_ldflags='' +qi_cppflags='' return_variables() { @@ -79,6 +86,10 @@ return_variables() "packagedir = $packagedir" \ "targetdir = $targetdir" \ "outdir = $outdir" \ + "qi_cflags = $qi_cflags" \ + "qi_cxxflags = $qi_cxxflags" \ + "qi_ldflags = $qi_ldflags" \ + "qi_cppflags = $qi_cppflags" \ "" } @@ -191,6 +202,34 @@ do --outdir=*) outdir="${1#*=}" ;; + --qi-cflags) + qi_cflags="$2" + shift + ;; + --qi-cflags=*) + qi_cflags="${1#*=}" + ;; + --qi-cxxflags) + qi_cxxflags="$2" + shift + ;; + --qi-cxxflags=*) + qi_cxxflags="${1#*=}" + ;; + --qi-ldflags) + qi_ldflags="$2" + shift + ;; + --qi-ldflags=*) + qi_ldflags="${1#*=}" + ;; + --qi-cppflags) + qi_cppflags="$2" + shift + ;; + --qi-cppflags=*) + qi_cppflags="${1#*=}" + ;; --help | --hel | --he | --h | '--?' | -help | -hel | -he | -h | '-?' ) usage exit diff --git a/qi/doc/qi-header.texi b/qi/doc/qi-header.texi index d1ae5178..5098d18d 100644 --- a/qi/doc/qi-header.texi +++ b/qi/doc/qi-header.texi @@ -3,12 +3,12 @@ @comment %**start of header @setfilename qi.info @settitle Qi user guide -@documentencoding ISO-8859-1 +@documentencoding UTF-8 @syncodeindex pg cp @comment %**end of header -@set VERSION 2.12-rc2 -@set UPDATED 11 Apr 2023 +@set VERSION 2.12 +@set UPDATED 04 Apr 2024 @dircategory Package management @direntry @@ -52,7 +52,7 @@ This user guide is for Qi (version @value{VERSION}, @end menu @copying -Copyright @copyright{} 2019-2023 Matias Andres Fonzo, Santiago del Estero, +Copyright @copyright{} 2019-2024 Matias Andres Fonzo, Santiago del Estero, Argentina. Permission is granted to copy, distribute and/or modify this document diff --git a/qi/doc/qi.1 b/qi/doc/qi.1 index 58e09fb8..ba89e0fc 100644 --- a/qi/doc/qi.1 +++ b/qi/doc/qi.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH QI "1" "April 2023" "qi 2.12-rc2" "User Commands" +.TH QI "1" "April 2024" "qi 2.12" "User Commands" .SH NAME qi \- a simple but well-integrated package manager .SH SYNOPSIS diff --git a/qi/doc/qi.html b/qi/doc/qi.html index 6c84cbd6..711214fe 100644 --- a/qi/doc/qi.html +++ b/qi/doc/qi.html @@ -1,15 +1,15 @@ - + + + - - - Qi user guide @@ -17,15 +17,18 @@ Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. --> + + + @@ -48,39 +52,18 @@ ul.no-bullet {list-style: none} -
+
+

Next:   [Index]

-

This user guide is for Qi (version 2.12-rc2, -11 Apr 2023). -

- - - - - - - - - - - -
• Introduction to Qi  Description and features of qi -
• Invoking qi  Command-line options -
• The qirc file  Configuration file -
• Packages  Managing packages -
• Recipes  Building packages -
• Order files  Handling build order -
• Creating packages  Making Qi packages -
• Examining packages  Debugging purposes -
• Qi exit status  Exit codes -
• Index   -
+

This user guide is for Qi (version 2.12, +04 Apr 2024). +


-

Copyright © 2019-2023 Matias Andres Fonzo, Santiago del Estero, +

Copyright © 2019-2024 Matias Andres Fonzo, Santiago del Estero, Argentina.

Permission is granted to copy, distribute and/or modify this document @@ -89,10 +72,23 @@ any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.

+
-
+
+

-Next: , Previous: , Up: Top   [Index]

+Next:   [Index]

1 Introduction to Qi

@@ -117,9 +113,11 @@ dependencies for the magic: graft(1) and tarlz(1), the rest is expected to be found in any Unix-like system.

-
+
+
+

-Next: , Previous: , Up: Top   [Index]

+Next: , Previous:   [Index]

2 Invoking qi

@@ -137,35 +135,35 @@ performed during or after the process.

Qi supports the following commands:

-
warn
+
warn

Warn about files that will be installed.

-
install
+
install

Install packages.

-
remove
+
remove

Remove packages.

-
upgrade
+
upgrade

Upgrade packages.

-
extract
+
extract

Extract packages for debugging purposes.

-
create
+
create

Create a .tlz package from directory.

-
build
+
build

Build packages using recipe names.

-
order
+
order

Resolve build order through .order files

@@ -173,13 +171,13 @@ performed during or after the process.

Options when installing, removing, or upgrading software packages:

-
-f
-
--force
+
-f
+
--force

Force upgrade of pre-existing packages.

-
-k
-
--keep
+
-k
+
--keep

Keep directories when build/remove/upgrade.

Keep (don’t delete) the package directory when using remove/upgrade command. @@ -190,23 +188,23 @@ recipes as ‘${keep_srcdir}’ and ‘${keep_des Special variables for details.

-
-p
-
--prune
+
-p
+
--prune

Prune conflicts.

-
-P
-
--packagedir=<dir>
+
-P
+
--packagedir=<dir>

Set directory for package installations.

-
-t
-
--targetdir=<dir>
+
-t
+
--targetdir=<dir>

Set target directory for symbolic links.

-
-r
-
--rootdir=<dir>
+
-r
+
--rootdir=<dir>

Use the fully qualified named directory as the root directory for all qi operations.

@@ -218,62 +216,62 @@ relative to the specified directory, excepting the graft log file.

Options when building software packages using recipes:

-
-a
-
--architecture
+
-a
+
--architecture

Set architecture name for the package.

-
-j
-
--jobs
+
-j
+
--jobs

Parallel jobs for the compiler.

This option sets the variable ‘${jobs}’. If not specified, default sets to 1.

-
-S
-
--skip-questions
+
-S
+
--skip-questions

Skip questions on completed recipes.

-
-1
-
--increment
+
-1
+
--increment

Increment release number (‘${release}’ + 1).

The effect of this option will be omitted if –no-package is being used.

-
-n
-
--no-package
+
-n
+
--no-package

Do not create a .tlz package.

-
-i
-
--install
+
-i
+
--install

Install package after the build.

-
-u
-
--upgrade
+
-u
+
--upgrade

Upgrade package after the build.

-
-o
-
--outdir=<dir>
+
-o
+
--outdir=<dir>

Where the packages produced will be written.

This option sets the variable ‘${outdir}’.

-
-w
-
--worktree=<dir>
+
-w
+
--worktree=<dir>

Where archives, patches, recipes are expected.

This option sets the variable ‘${worktree}’.

-
-s
-
--sourcedir=<dir>
+
-s
+
--sourcedir=<dir>

Where compressed sources will be found.

This option sets the variable ‘${tardir}’. @@ -283,8 +281,8 @@ sets to 1.

Other options:

-
-v
-
--verbose
+
-v
+
--verbose

Be verbose (an extra -v gives more).

It sets the verbosity level, default sets to 0. @@ -293,15 +291,15 @@ sets to 1. Although at the moment it is limited to graft(1) verbosity.

-
-N
-
--no-rc
+
-N
+
--no-rc

Do not read the configuration file.

This will ignore reading the qirc file.

-
-L
-
--show-location
+
-L
+
--show-location

Print default directory locations and exit.

This will print the target directory, package directory, working tree, @@ -331,13 +329,13 @@ configuration file by setting the option ‘-N’.

eval "$(qi -N --targetdir=/directory -L)"

-
-h
-
--help
+
-h
+
--help

Display the usage and exit.

-
-V
-
--version
+
-V
+
--version

This will print the (short) version information and then exit.

@@ -357,9 +355,11 @@ For more details, see the Qi exit status section.

-
+
+
+

-Next: , Previous: , Up: Top   [Index]

+Next: , Previous:   [Index]

3 The qirc file

@@ -393,9 +393,11 @@ according to the $HOME.

-
+
+
+

-Next: , Previous: , Up: Top   [Index]

+Next: , Previous:   [Index]

4 Packages

@@ -423,7 +425,14 @@ made by graft(1) taking ‘${packagedir}/package_name’ in links from a common area are made to the package files. This allows multiple versions of the same package to coexist on the same system.

-

4.1 Package conflicts

+ +
+

4.1 Package conflicts

All the links to install or remove a package are handled by graft(1). @@ -450,7 +459,9 @@ graft(1) to remove those parts that are not in conflict, leaving the links to the belonging package. This behavior can be forced if the –prune option is given.

-

4.2 Installing packages

+
+
+

4.2 Installing packages

To install a single package, simply type: @@ -524,7 +535,9 @@ produced is captured by Qi to install each package. /var/cache/qi/packages/amd64/vala_0.42.3_amd64-1@devel.tlz

-

4.3 Removing packages

+
+
+

4.3 Removing packages

To remove a package, simply type: @@ -577,7 +590,9 @@ changed if the –keep option is passed:

This will match with the package directory.

-

4.4 Upgrading packages

+
+
+

4.4 Upgrading packages

The upgrade command inherits the properties of the installation and removal @@ -623,7 +638,11 @@ upgrade process, just pass: 

qi upgrade --force gcc_9.0.1_i586-1@devel.tlz
-

4.4.1 Package blacklist

+ +
+

4.4.1 Package blacklist

To implement general package facilities, either to install, remove or @@ -656,9 +675,13 @@ the package category is avoided for common matching. See Special variables for a description of these variables.

-
+
+
+
+
+

-Next: , Previous: , Up: Top   [Index]

+Next: , Previous:   [Index]

5 Recipes

@@ -688,7 +711,16 @@ from source.

If there are other functions defined by the packager, Qi detects them for later execution.

-

5.1 Variables

+ +
+

5.1 Variables

A "variable" is a shell variable defined either in qirc @@ -717,7 +749,9 @@ previously defined in qirc and variables with default values. set by the command-line, variables previously defined in the recipe, variables defined in qirc, and variables with default values.

-

5.2 Special variables

+
+
+

5.2 Special variables

There are variables which can only be set using the command line options or @@ -916,7 +950,9 @@ licensing. Comma would have lower precedence, plus added special terms. 

license="LGPL, GPL | Artistic - added permission"
-

5.3 Writing recipes

+
+
+

5.3 Writing recipes

Originally, Qi was designed for the series of Dragora GNU/Linux-Libre 3; @@ -931,7 +967,9 @@ are some references to well-written recipes:

  • https://git.savannah.nongnu.org/cgit/dragora/dragora-extras.git/tree/recipes
    • -

    5.4 Building packages

    +
    +
    +

    5.4 Building packages

    A recipe is any valid regular file. Qi sets priorities for reading a @@ -984,7 +1022,9 @@ is given. directory for later inspection. A log file of the build process will be created redirecting both, standard error and standard output to tee(1).

    -

    5.5 Variables from the environment

    +
    +
    +

    5.5 Variables from the environment

    Qi has environment variables which can be used at build time: @@ -1049,7 +1089,9 @@ timestamps on the package contents (when it is created). More information about this can be found at https://reproducible-builds.org/specs/source-date-epoch/.

    -

    5.6 The meta file

    +
    +
    +

    5.6 The meta file

    The "meta file" is a regular file created during the build process, it @@ -1109,9 +1151,12 @@ line of ‘description’, mentioned as the "brief des if the declared variable ‘arch’ is not equal to the "noarch" value.

    -
    +
    +
    +
    +

    -Next: , Previous: , Up: Top   [Index]

    +Next: , Previous:   [Index]

    6 Order files

    @@ -1173,9 +1218,11 @@ libs/tiff
    -
    +
    +
    +

    -Next: , Previous: , Up: Top   [Index]

    +Next: , Previous:   [Index]

    7 Creating packages

    @@ -1208,9 +1255,11 @@ written into ‘/var/cache/qi/packages/’.

    -
    +
    +
    +

    -Next: , Previous: , Up: Top   [Index]

    +Next: , Previous:   [Index]

    8 Examining packages

    @@ -1240,9 +1289,11 @@ of the TMPDIR variable.

    -
    +
    +
    +

    -Next: , Previous: , Up: Top   [Index]

    +Next: , Previous:   [Index]

    9 Qi exit status

    @@ -1250,11 +1301,11 @@ Next: , Previous: -
    ‘0’
    +
    ‘0’

    Successful completion (no errors).

    -
    ‘1’
    +
    ‘1’

    Minor common errors:

    Footnotes

    -
    (1)
    +
    (1)

    For more details about tarlz and the lzip format, visit https://lzip.nongnu.org/tarlz.html.

    -
    (2)
    +
    (2)

    The official guide for Graft can be found at https://peters.gormand.com.au/Home/tools/graft/graft.html.

    -
    (3)
    +
    (3)

    About the ‘--bsolid’ granularity option of tarlz(1), https://www.nongnu.org/lzip/manual/tarlz_manual.html#g_t_002d_002dbsolid.

    -
    (4)
    +
    (4)

    The proposal for ‘license’ was made by Richard M. Stallman at https://lists.gnu.org/archive/html/gnu-linux-libre/2016-05/msg00003.html.

    -
    diff --git a/qi/doc/qi.info b/qi/doc/qi.info index 19a5671b..29f6dcfd 100644 --- a/qi/doc/qi.info +++ b/qi/doc/qi.info @@ -1,6 +1,6 @@ -This is qi.info, produced by makeinfo version 6.7 from qi-header.texi. +This is qi.info, produced by makeinfo version 6.8 from qi-header.texi. -Copyright © 2019-2023 Matias Andres Fonzo, Santiago del Estero, +Copyright © 2019-2024 Matias Andres Fonzo, Santiago del Estero, Argentina. Permission is granted to copy, distribute and/or modify this document @@ -18,7 +18,7 @@ File: qi.info, Node: Top, Next: Introduction to Qi, Up: (dir) Qi user guide ************* -This user guide is for Qi (version 2.12-rc2, 11 Apr 2023). +This user guide is for Qi (version 2.12, 04 Apr 2024). * Menu: @@ -34,7 +34,7 @@ This user guide is for Qi (version 2.12-rc2, 11 Apr 2023). * Index:: - Copyright © 2019-2023 Matias Andres Fonzo, Santiago del Estero, + Copyright © 2019-2024 Matias Andres Fonzo, Santiago del Estero, Argentina. Permission is granted to copy, distribute and/or modify this document @@ -77,68 +77,68 @@ This chapter describes the synopsis for invoking Qi. Usage: qi COMMAND [OPTION...] [FILE]... -One mandatory command specifies the operation that 'qi' should perform, +One mandatory command specifies the operation that ‘qi’ should perform, options are meant to detail how this operation should be performed during or after the process. Qi supports the following commands: -'warn' +‘warn’ Warn about files that will be installed. -'install' +‘install’ Install packages. -'remove' +‘remove’ Remove packages. -'upgrade' +‘upgrade’ Upgrade packages. -'extract' +‘extract’ Extract packages for debugging purposes. -'create' +‘create’ Create a .tlz package from directory. -'build' +‘build’ Build packages using recipe names. -'order' +‘order’ Resolve build order through .order files Options when installing, removing, or upgrading software packages: -'-f' -'--force' +‘-f’ +‘--force’ Force upgrade of pre-existing packages. -'-k' -'--keep' +‘-k’ +‘--keep’ Keep directories when build/remove/upgrade. - Keep (don't delete) the package directory when using remove/upgrade + Keep (don’t delete) the package directory when using remove/upgrade command. - This will also try to preserve the directories '${srcdir}' and - '${destdir}' when using build command. Its effect is available in - recipes as '${keep_srcdir}' and '${keep_destdir}'. See *note + This will also try to preserve the directories ‘${srcdir}’ and + ‘${destdir}’ when using build command. Its effect is available in + recipes as ‘${keep_srcdir}’ and ‘${keep_destdir}’. See *note Special variables: Recipes. for details. -'-p' -'--prune' +‘-p’ +‘--prune’ Prune conflicts. -'-P' -'--packagedir=' +‘-P’ +‘--packagedir=’ Set directory for package installations. -'-t' -'--targetdir=' +‘-t’ +‘--targetdir=’ Set target directory for symbolic links. -'-r' -'--rootdir=' +‘-r’ +‘--rootdir=’ Use the fully qualified named directory as the root directory for all qi operations. @@ -147,62 +147,62 @@ Options when installing, removing, or upgrading software packages: Options when building software packages using recipes: -'-a' -'--architecture' +‘-a’ +‘--architecture’ Set architecture name for the package. -'-j' -'--jobs' +‘-j’ +‘--jobs’ Parallel jobs for the compiler. - This option sets the variable '${jobs}'. If not specified, default + This option sets the variable ‘${jobs}’. If not specified, default sets to 1. -'-S' -'--skip-questions' +‘-S’ +‘--skip-questions’ Skip questions on completed recipes. -'-1' -'--increment' - Increment release number ('${release}' + 1). +‘-1’ +‘--increment’ + Increment release number (‘${release}’ + 1). - The effect of this option will be omitted if -no-package is being + The effect of this option will be omitted if –no-package is being used. -'-n' -'--no-package' +‘-n’ +‘--no-package’ Do not create a .tlz package. -'-i' -'--install' +‘-i’ +‘--install’ Install package after the build. -'-u' -'--upgrade' +‘-u’ +‘--upgrade’ Upgrade package after the build. -'-o' -'--outdir=' +‘-o’ +‘--outdir=’ Where the packages produced will be written. - This option sets the variable '${outdir}'. + This option sets the variable ‘${outdir}’. -'-w' -'--worktree=' +‘-w’ +‘--worktree=’ Where archives, patches, recipes are expected. - This option sets the variable '${worktree}'. + This option sets the variable ‘${worktree}’. -'-s' -'--sourcedir=' +‘-s’ +‘--sourcedir=’ Where compressed sources will be found. - This option sets the variable '${tardir}'. + This option sets the variable ‘${tardir}’. Other options: -'-v' -'--verbose' +‘-v’ +‘--verbose’ Be verbose (an extra -v gives more). It sets the verbosity level, default sets to 0. @@ -211,14 +211,14 @@ Other options: detailed. Although at the moment it is limited to graft(1) verbosity. -'-N' -'--no-rc' +‘-N’ +‘--no-rc’ Do not read the configuration file. This will ignore reading the qirc file. -'-L' -'--show-location' +‘-L’ +‘--show-location’ Print default directory locations and exit. This will print the target directory, package directory, working @@ -234,29 +234,29 @@ Other options: You can set these environment variables using one of the following methods: - 'eval "$(qi -L)"' + ‘eval "$(qi -L)"’ This will display the default locations taking into account the values set from the qirc configuration file. You can deny the - influence of the configuration file by setting the option '-N'. + influence of the configuration file by setting the option ‘-N’. - 'eval "$(qi -N -L)"' + ‘eval "$(qi -N -L)"’ Or you can adjust the new locations using the command-line options, e.g: - 'eval "$(qi -N --targetdir=/directory -L)"' + ‘eval "$(qi -N --targetdir=/directory -L)"’ -'-h' -'--help' +‘-h’ +‘--help’ Display the usage and exit. -'-V' -'--version' +‘-V’ +‘--version’ This will print the (short) version information and then exit. - The same can be achieved if Qi is invoked as 'qi version'. + The same can be achieved if Qi is invoked as ‘qi version’. When FILE is -, qi can read from the standard input. See examples from the *note Packages:: section. @@ -274,7 +274,7 @@ File: qi.info, Node: The qirc file, Next: Packages, Prev: Invoking qi, Up: T 3 The qirc file *************** -The global 'qirc' file offers a way to define variables and tools (such +The global ‘qirc’ file offers a way to define variables and tools (such as a download manager) for default use. This file is used by qi at runtime, e.g., to build, install, remove or upgrade packages. @@ -283,18 +283,18 @@ variable in the shell. The command line options related to the package directory and target directory and some of the command line options used for the build -command, have the power to override the values declared on 'qirc'. See +command, have the power to override the values declared on ‘qirc’. See *note Invoking qi::. The order in which qi looks for this file is: - 1. '${HOME}/.qirc' Effective user. + 1. ‘${HOME}/.qirc’ Effective user. - 2. '${sysconfdir}/qirc' System-wide. + 2. ‘${sysconfdir}/qirc’ System-wide. If you intend to run qi as effective user, the file -'${sysconfdir}/qirc' could be copied to '${HOME}/.qirc' setting the -paths for '${packagedir}' and '${targetdir}' according to the '$HOME'. +‘${sysconfdir}/qirc’ could be copied to ‘${HOME}/.qirc’ setting the +paths for ‘${packagedir}’ and ‘${targetdir}’ according to the ‘$HOME’.  File: qi.info, Node: Packages, Next: Recipes, Prev: The qirc file, Up: Top @@ -308,17 +308,17 @@ associated to a specific software. The package format used by qi is a simplified POSIX pax archive compressed using lzip(1). The file extension for packages ends in -'.tlz'. +‘.tlz’. Both package installation and package de-installation are managed using -two important (internal) variables: '${packagedir}' and '${targetdir}', +two important (internal) variables: ‘${packagedir}’ and ‘${targetdir}’, these values can be changed in the configuration file or via options. - '${packagedir}' is a common directory tree where the package contents + ‘${packagedir}’ is a common directory tree where the package contents will be decompressed (will reside). - '${targetdir}' is a target directory where the links will be made by -graft(1) taking '${packagedir}/package_name' into account. + ‘${targetdir}’ is a target directory where the links will be made by +graft(1) taking ‘${packagedir}/package_name’ into account. Packages are installed in self-contained directory trees and symbolic links from a common area are made to the package files. This allows @@ -333,13 +333,13 @@ certain conflicts may arise between the packages. graft(2) defines a CONFLICT as one of the following conditions: - * If the package object is a directory and the target object exists + • If the package object is a directory and the target object exists but is not a directory. - * If the package object is not a directory and the target object + • If the package object is not a directory and the target object exists and is not a symbolic link. - * If the package object is not a directory and the target object + • If the package object is not a directory and the target object exists and is a symbolic link to something other than the package object. @@ -347,7 +347,7 @@ The default behavior of qi for an incoming package is to ABORT if a conflict arises. When a package is going to be deleted, qi tells to graft(1) to remove those parts that are not in conflict, leaving the links to the belonging package. This behavior can be forced if the --prune option is given. +–prune option is given. 4.2 Installing packages ======================= @@ -370,23 +370,23 @@ See the process of an installation: qi install --verbose mariana_3.0_i586-1@woman.tlz - A second -verbose or -v option gives more (very verbose). + A second –verbose or -v option gives more (very verbose). Installing package in a different location: qi install --rootdir=/media/floppy lzip_1.21_i586-1@compressors.tlz - Important: the -rootdir option assumes '${targetdir}' and -'${packagedir}'. See the following example: + Important: the –rootdir option assumes ‘${targetdir}’ and +‘${packagedir}’. See the following example: qi install --rootdir=/home/selk lzip_1.21_i586-1@compressors.tlz The content of "lzip_1.21_i586-1@compressors.tlz" will be -decompressed into '/home/selk/pkgs/lzip_1.21_i586-1@compressors'. +decompressed into ‘/home/selk/pkgs/lzip_1.21_i586-1@compressors’. Assuming that the main binary for lzip is under -'/home/selk/pkgs/lzip_1.21_i586-1@compressors/usr/bin/' the target for -"usr/bin" will be created at '/home/selk'. Considering that you have -exported the 'PATH' as '${HOME}/usr/bin', now the system is able to see +‘/home/selk/pkgs/lzip_1.21_i586-1@compressors/usr/bin/’ the target for +"usr/bin" will be created at ‘/home/selk’. Considering that you have +exported the ‘PATH’ as ‘${HOME}/usr/bin’, now the system is able to see the recent lzip command. Installing from a list of packages using standard input: @@ -412,8 +412,8 @@ To remove a package, simply type: qi remove xz_5.2.4_i586-1@compressors.tlz -Remove command will match the package name using '${packagedir}' as -prefix. For example, if the value of '${packagedir}' has been set to +Remove command will match the package name using ‘${packagedir}’ as +prefix. For example, if the value of ‘${packagedir}’ has been set to /usr/pkg, this will be equal to: qi remove /usr/pkg/xz_5.2.4_i586-1@compressors @@ -422,11 +422,11 @@ Detailed output: qi remove --verbose /usr/pkg/xz_5.2.4_i586-1@compressors - A second -verbose or -v option gives more (very verbose). + A second –verbose or -v option gives more (very verbose). By default the remove command does not preserve a package directory -after removing its links from '${targetdir}', but this behavior can be -changed if the -keep option is passed: +after removing its links from ‘${targetdir}’, but this behavior can be +changed if the –keep option is passed: qi remove --keep /usr/pkg/lzip_1.21_i586-1@compressors @@ -449,7 +449,7 @@ Removing a package using standard input: The upgrade command inherits the properties of the installation and removal process. To make sure that a package is updated, the package is -installed in a temporary directory taking '${packagedir}' into account. +installed in a temporary directory taking ‘${packagedir}’ into account. Once the incoming package is pre-installed, qi can proceed to search and delete packages that have the same name (considered as previous ones). Finally, the package is re-installed at its final location and the @@ -476,7 +476,7 @@ To see the upgrade process: qi upgrade --verbose gcc_9.0.1_i586-1@devel.tlz - A second -verbose or -v option gives more (very verbose). + A second –verbose or -v option gives more (very verbose). To force the upgrade of an existing package: @@ -501,8 +501,8 @@ ones, such as the C library. The blacklist is related to the upgrade command only, consists in installing a package instead of updating it or removing previous versions of it; the content of the package will be updated over the -existing content at '${packagedir}', while the existing links from -'${targetdir}' will be preserved. A pruning of links will be carried +existing content at ‘${packagedir}’, while the existing links from +‘${targetdir}’ will be preserved. A pruning of links will be carried out in order to re-link possible differences with the recent content, this helps to avoid leaving dead links in the target directory. @@ -510,7 +510,7 @@ Package names for the blacklist to be declared must be set from the configuration file. By default, it is declared using the package name, which is more than enough for critical system packages, but if you want to be more specific, you can declare a package using: -'${pkgname}_${pkgversion}_${arch}-${release}' where the package category +‘${pkgname}_${pkgversion}_${arch}-${release}’ where the package category is avoided for common matching. See *note Special variables: Recipes. for a description of these variables. @@ -542,9 +542,9 @@ sections. By convention, the syntax of a section is: The section name is followed by parentheses, one newline and an opening brace. The line finishing the section contains just a closing brace. The section names or the function names currently recognized are -'build'. +‘build’. - The 'build' section (or *shell function*) is an augmented shell + The ‘build’ section (or *shell function*) is an augmented shell script that contains the main instructions to build software from source. @@ -554,8 +554,8 @@ for later execution. 5.1 Variables ============= -A "variable" is a *shell variable* defined either in 'qirc' or in a -recipe to represent a string of text, called the variable's "value". +A "variable" is a *shell variable* defined either in ‘qirc’ or in a +recipe to represent a string of text, called the variable’s "value". These values are substituted by explicit request in the definitions of other variables or in calls to external commands. @@ -565,81 +565,81 @@ directories to write output to, or anything else you can imagine. Definitions of variables in qi have four levels of precedence. Options which define variables from the command-line override those -specified in the 'qirc' file, while variables defined in the recipe -override those specified in 'qirc', taking priority over those variables +specified in the ‘qirc’ file, while variables defined in the recipe +override those specified in ‘qirc’, taking priority over those variables set by command-line options. Finally, the variables have default values if they are not defined anywhere. Options that set variables through the command-line can only -reference variables defined in 'qirc' and variables with default values. +reference variables defined in ‘qirc’ and variables with default values. - Definitions of variables in 'qirc' can only reference variables -previously defined in 'qirc' and variables with default values. + Definitions of variables in ‘qirc’ can only reference variables +previously defined in ‘qirc’ and variables with default values. Definitions of variables in the recipe can only reference variables set by the command-line, variables previously defined in the recipe, -variables defined in 'qirc', and variables with default values. +variables defined in ‘qirc’, and variables with default values. 5.2 Special variables ===================== There are variables which can only be set using the command line options -or via 'qirc', there are other special variables which can be defined or +or via ‘qirc’, there are other special variables which can be defined or redefined in a recipe. See the following definitions: - 'outdir' is the directory where the packages produced are written. + ‘outdir’ is the directory where the packages produced are written. This variable can be redefined per-recipe. Default sets to -'/var/cache/qi/packages'. +‘/var/cache/qi/packages’. - 'worktree' is the working tree where archives, patches, and recipes + ‘worktree’ is the working tree where archives, patches, and recipes are expected. This variable can not be redefined in the recipe. -Default sets to '/usr/src/qi'. +Default sets to ‘/usr/src/qi’. - 'tardir' is defined in the recipe to the directory where the tarball + ‘tardir’ is defined in the recipe to the directory where the tarball containing the source can be found. The full name of the tarball is -composed as '${tardir}/$tarname'. Its value is available in the recipe -as '${tardir}'; a value of . for 'tardir' sets it to the value of CWD +composed as ‘${tardir}/$tarname’. Its value is available in the recipe +as ‘${tardir}’; a value of . for ‘tardir’ sets it to the value of CWD (Current Working Directory), this is where the recipe lives. - 'arch' is the architecture to compose the package name. Its value is -available in the recipe as '${arch}'. Default value is the one that was + ‘arch’ is the architecture to compose the package name. Its value is +available in the recipe as ‘${arch}’. Default value is the one that was set in the Qi configuration. - 'jobs' is the number of parallel jobs to pass to the compiler. Its -value is available in the recipe as '${jobs}'. The default value is 1. + ‘jobs’ is the number of parallel jobs to pass to the compiler. Its +value is available in the recipe as ‘${jobs}’. The default value is 1. - The two variables '${srcdir}' and '${destdir}' can be set in the + The two variables ‘${srcdir}’ and ‘${destdir}’ can be set in the recipe, as any other variable, but if they are not, qi uses default values for them when building a package. - 'srcdir' contains the source code to be compiled, and defaults to -'${program}-${version}'. 'destdir' is the place where the built package -will be installed, and defaults to '${TMPDIR}/package-${program}'. + ‘srcdir’ contains the source code to be compiled, and defaults to +‘${program}-${version}’. ‘destdir’ is the place where the built package +will be installed, and defaults to ‘${TMPDIR}/package-${program}’. - If 'pkgname' is left undefined, the special variable 'program' is -assigned by default. If 'pkgversion' is left undefined, the special -variable 'version' is assigned by default. + If ‘pkgname’ is left undefined, the special variable ‘program’ is +assigned by default. If ‘pkgversion’ is left undefined, the special +variable ‘version’ is assigned by default. - 'pkgname' and 'pkgversion' along with: 'version', 'arch', 'release', -and (optionally) 'pkgcategory' are used to produce the package name in + ‘pkgname’ and ‘pkgversion’ along with: ‘version’, ‘arch’, ‘release’, +and (optionally) ‘pkgcategory’ are used to produce the package name in the form: -'${pkgname}_${pkgversion}_${arch}-${release}[@${pkgcategory}].tlz' +‘${pkgname}_${pkgversion}_${arch}-${release}[@${pkgcategory}].tlz’ - 'pkgcategory' is an optional special variable that can be defined on + ‘pkgcategory’ is an optional special variable that can be defined on the recipe to categorize the package name. If it is defined, then the package output will be composed as -'${pkgname}_${pkgversion}_${arch}-${release}[@${pkgcategory}.tlz'. -Automatically, the value of 'pkgcategory' will be prefixed using the '@' +‘${pkgname}_${pkgversion}_${arch}-${release}[@${pkgcategory}.tlz’. +Automatically, the value of ‘pkgcategory’ will be prefixed using the ‘@’ (at) symbol which will be added to the last part of the package name. - A special variable called 'replace' can be used to declare package + A special variable called ‘replace’ can be used to declare package names that will be replaced at installation time. - The special variables 'keep_srcdir' and 'keep_destdir' are provided -in order to preserve the directories '${srcdir}' or '${destdir}', if + The special variables ‘keep_srcdir’ and ‘keep_destdir’ are provided +in order to preserve the directories ‘${srcdir}’ or ‘${destdir}’, if those exists as such. Note: The declaration of these variables are subject to manual deactivation; its purpose in recipes is to preserve -the directories that relate to the package's build (source) and +the directories that relate to the package’s build (source) and destination directory, that is so that another recipe can get a new package (or meta package) from there. For example, the declarations can be done as: @@ -653,22 +653,22 @@ must deactivate the variables at the end: unset -v keep_srcdir keep_destdir - This will leave the 'keep_srcdir' and 'keep_destdir' variables blank + This will leave the ’keep_srcdir’ and ’keep_destdir’ variables blank to continue with the rest of the recipes. - The special variable 'opt_skiprecipe' is available when you need to + The special variable ‘opt_skiprecipe’ is available when you need to ignore a recipe cleanly, continuing with the next recipe. May you add a -conditional test then set it as 'opt_skiprecipe=opt_skiprecipe'. +conditional test then set it as ‘opt_skiprecipe=opt_skiprecipe’. - The variable 'tarlz_compression_options' can be used to change the -default compression options in tarlz(1), default sets to '-9 --solid'. + The variable ‘tarlz_compression_options’ can be used to change the +default compression options in tarlz(1), default sets to ‘-9 --solid’. For example if the variable is declared as: tarlz_compression_options="-0 --bsolid" - It will change the granularity of tarlz(1) by using the '--bsolid' + It will change the granularity of tarlz(1) by using the ‘--bsolid’ option (1), as well as increasing the compression speed by lowering the -compression level with '-0'. +compression level with ‘-0’. This is only recommended for recipes where testing, or faster processing is desired to create the packaged file more quickly. It is @@ -677,50 +677,50 @@ packages. A typical recipe contains the following variables: - * 'program': Software name. + • ‘program’: Software name. It matches the source name. It is also used to compose the name of - the package if '${pkgname}' is not specified. + the package if ‘${pkgname}’ is not specified. - * 'version': Software version. + • ‘version’: Software version. It matches the source name. It is also used to compose the version - of the package if '${pkgversion}' is not specified. + of the package if ‘${pkgversion}’ is not specified. - * 'arch': Software architecture. + • ‘arch’: Software architecture. It is used to compose the architecture of the package in which it is build. - * 'release': Release number. + • ‘release’: Release number. This is used to reflect the release number of the package. It is recommended to increase this number after any significant change in the recipe or post-install script. - * 'pkgcategory': Package category. + • ‘pkgcategory’: Package category. Optional but recommended variable to categorize the package name when it is created. Obtaining sources over the network must be declared in the recipe using -the 'fetch' variable. +the ‘fetch’ variable. - The variables 'netget' and 'rsync' can be defined in 'qirc' to + The variables ‘netget’ and ‘rsync’ can be defined in ‘qirc’ to establish a network downloader in order to get the sources. If they are not defined, qi uses default values: - 'netget' is the general network downloader tool, defaults sets to -'wget2 -c -w1 -t3 --no-check-certificate'. + ‘netget’ is the general network downloader tool, defaults sets to +‘wget2 -c -w1 -t3 --no-check-certificate’. - 'rsync' is the network tool for sources containing the prefix for the -RSYNC protocol, default sets to 'rsync -v -a -L -z -i --progress'. + ‘rsync’ is the network tool for sources containing the prefix for the +RSYNC protocol, default sets to ‘rsync -v -a -L -z -i --progress’. - The variable 'description' is used to print the package description + The variable ‘description’ is used to print the package description when a package is installed. A description has two parts: a brief description, and a long -description. By convention, the syntax of 'description' is: +description. By convention, the syntax of ‘description’ is: description=" Brief description. @@ -747,12 +747,12 @@ An example looks like: the same one would be used on the meta file creation. See *note The meta file: Recipes. section. - The 'homepage' variable is used to declare the main site or home + The ‘homepage’ variable is used to declare the main site or home page: homepage=https://www.gnu.org/software/gcc - The variable 'license' is used for license information(2). Some code + The variable ‘license’ is used for license information(2). Some code in the program can be covered by license A, license B, or license C. For "separate licensing" or "heterogeneous licensing", we suggest using *|* for a disjunction, *&* for a conjunction (if that ever happens in a @@ -765,14 +765,14 @@ have lower precedence, plus added special terms. =================== Originally, Qi was designed for the series of Dragora GNU/Linux-Libre 3; -this doesn't mean you can't use it in another distribution, just that if -you do, you'll have to try it out for yourself. To help with this, here +this doesn’t mean you can’t use it in another distribution, just that if +you do, you’ll have to try it out for yourself. To help with this, here are some references to well-written recipes: - * - * - * - * + • + • + • + • 5.4 Building packages @@ -788,7 +788,7 @@ recipe, the order in which qi looks for a recipe is: name. 3. If the recipe is not in the current working directory, it will be - searched under '${worktree}/recipes'. The last component will be + searched under ‘${worktree}/recipes’. The last component will be completed adding "recipe" to the specified path name. To build a single package, type: @@ -809,14 +809,14 @@ Only process a recipe but do not create the binary package: qi build --no-package dict/aspell - The options -install or -upgrade have no effect when -no-package is + The options –install or –upgrade have no effect when –no-package is given. This is useful to inspect the build process of the above recipe: - qi build -keep -no-package dict/aspell 2>&1 | tee aspell-log.txt + qi build –keep –no-package dict/aspell 2>&1 | tee aspell-log.txt - The -keep option could preserve the source directory and the + The –keep option could preserve the source directory and the destination directory for later inspection. A log file of the build process will be created redirecting both, standard error and standard output to tee(1). @@ -826,17 +826,17 @@ output to tee(1). Qi has environment variables which can be used at build time: - The variable 'TMPDIR' sets the temporary directory for sources, which + The variable ‘TMPDIR’ sets the temporary directory for sources, which is used for package extractions (see *note Examining packages::) and is -prepended to the value of '${srcdir}' and '${destdir}' in build command. -By convention its default value is equal to '/usr/src/qi/build'. +prepended to the value of ‘${srcdir}’ and ‘${destdir}’ in build command. +By convention its default value is equal to ‘/usr/src/qi/build’. - The variables 'QICFLAGS', 'QICXXFLAGS', 'QILDFLAGS', and 'QICPPFLAGS' -have no effect by default. The environment variables such as 'CFLAGS', -'CXXFLAGS', 'LDFLAGS', and 'CPPFLAGS' are unset at compile time: + The variables ‘QICFLAGS’, ‘QICXXFLAGS’, ‘QILDFLAGS’, and ‘QICPPFLAGS’ +have no effect by default. The environment variables such as ‘CFLAGS’, +‘CXXFLAGS’, ‘LDFLAGS’, and ‘CPPFLAGS’ are unset at compile time: Recommended practice is to set variables in the command line of -'configure' or _make(1)_ instead of exporting to the environment. As +‘configure’ or _make(1)_ instead of exporting to the environment. As follows: @@ -853,25 +853,25 @@ running configure in varying environments can be dangerous. environment passed to configure. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you - should set them in the configure command line, using 'VAR=value'. + should set them in the configure command line, using ‘VAR=value’. For example: - './configure CC=/usr/local2/bin/gcc' + ‘./configure CC=/usr/local2/bin/gcc’ - If for instance the user runs 'CC=bizarre-cc ./configure', then the + If for instance the user runs ‘CC=bizarre-cc ./configure’, then the cache, config.h, and many other output files depend upon bizarre-cc being the C compiler. If for some reason the user runs ./configure - again, or if it is run via './config.status --recheck', (See + again, or if it is run via ‘./config.status --recheck’, (See Automatic Remaking, and see config.status Invocation), then the configuration can be inconsistent, composed of results depending upon two different compilers. [...] Indeed, while configure can - notice the definition of CC in './configure CC=bizarre-cc', it is - impossible to notice it in 'CC=bizarre-cc ./configure', which, + notice the definition of CC in ‘./configure CC=bizarre-cc’, it is + impossible to notice it in ‘CC=bizarre-cc ./configure’, which, unfortunately, is what most users do. [...] configure: error: changes in the environment can compromise the build. - If the 'SOURCE_DATE_EPOCH' environment variable is set to a UNIX + If the ‘SOURCE_DATE_EPOCH’ environment variable is set to a UNIX timestamp (defined as the number of seconds, excluding leap seconds, since 01 Jan 1970 00:00:00 UTC.); then the given timestamp will be used to overwrite any newer timestamps on the package contents (when it is @@ -885,7 +885,7 @@ The "meta file" is a regular file created during the build process, it contains information about the package such as package name, package version, architecture, release, fetch address, description, and other minor data extracted from processed recipes. The name of the file is -generated as '${full_pkgname}.tlz.txt', and its purpose is to reflect +generated as ‘${full_pkgname}.tlz.txt’, and its purpose is to reflect essential information to the user without having to look inside the package content. The file format is also intended to be used by other scripts or by common Unix tools. @@ -919,28 +919,28 @@ scripts or by common Unix tools. fetch="https://ftp.gnu.org/gnu/gawk/gawk-5.0.1.tar.lz" replace="" - A package descriptions is extracted from the variable 'description' + A package descriptions is extracted from the variable ‘description’ where each line is interpreted literally and pre-formatted to fit in -(exactly) *80 columns*, plus the character '#' and a blank space is +(exactly) *80 columns*, plus the character ‘#’ and a blank space is prefixed to every line (shell comments). In addition to the Special variables, there are implicit variables such -as 'blurb': +as ‘blurb’: - The 'blurb' variable is related to the special variable -'description'. Its value is made from the first (substantial) line of -'description', mentioned as the "brief description". + The ‘blurb’ variable is related to the special variable +‘description’. Its value is made from the first (substantial) line of +‘description’, mentioned as the "brief description". - The build flags such as 'QICFLAGS', 'QICXXFLAGS', 'QILDFLAGS', and -'QICPPFLAGS' are only added to the meta file if the declared variable -'arch' is not equal to the "noarch" value. + The build flags such as ‘QICFLAGS’, ‘QICXXFLAGS’, ‘QILDFLAGS’, and +‘QICPPFLAGS’ are only added to the meta file if the declared variable +‘arch’ is not equal to the "noarch" value. ---------- Footnotes ---------- - (1) About the '--bsolid' granularity option of tarlz(1), + (1) About the ‘--bsolid’ granularity option of tarlz(1), . - (2) The proposal for 'license' was made by Richard M. Stallman at + (2) The proposal for ‘license’ was made by Richard M. Stallman at .  @@ -970,7 +970,7 @@ right to left, and removed from left to right: a Blank lines, colons and parentheses are simply ignored. Comment -lines beginning with '#' are allowed. +lines beginning with ‘#’ are allowed. An order file could be used to build a series of packages, for example, if the content is: @@ -985,7 +985,7 @@ if the content is: qi order imglibs.order | qi build --install - - The output of 'qi order imglibs.order' tells to qi in which order it + The output of ‘qi order imglibs.order’ tells to qi in which order it should build the recipes: devel/nasm @@ -1017,7 +1017,7 @@ full name: name-version-architecture-release[@pkgcategory].tlz qi create /var/cache/qi/packages/claws-mail_3.17.1_amd64-1@x-apps In this case, the package "claws-mail_3.17.1_amd64-1@x-apps" will be -written into '/var/cache/qi/packages/'. +written into ‘/var/cache/qi/packages/’. All packages produced are complemented by a checksum file (.sha256). @@ -1045,7 +1045,7 @@ requested the action, creation operation will be equal to *u=rwx,g=,o= to deploy the content will be equal to *u=rwx,g=rwx,o=rwx (0000)*. Note: the creation of the custom directory is influenced by the value of -the 'TMPDIR' variable. +the ‘TMPDIR’ variable.  File: qi.info, Node: Qi exit status, Next: Index, Prev: Examining packages, Up: Top @@ -1055,71 +1055,71 @@ File: qi.info, Node: Qi exit status, Next: Index, Prev: Examining packages, All the exit codes are described in this chapter. -'0' +‘0’ Successful completion (no errors). -'1' +‘1’ Minor common errors: - * Help usage on invalid options or required arguments. + • Help usage on invalid options or required arguments. - * Program needed by qi (prerequisite) is not available. + • Program needed by qi (prerequisite) is not available. -'2' +‘2’ Command execution error: This code is used to return the evaluation of an external command or shell arguments in case of failure. -'3' +‘3’ Integrity check error for compressed files. Compressed files means: - * A tarball file from tar(1), typically handled by the GNU tar + • A tarball file from tar(1), typically handled by the GNU tar implementation. Supported extensions: .tar, .tar.gz, .tgz, .tar.Z, .tar.bz2, .tbz2, .tbz, .tar.xz, .txz, .tar.zst, .tzst - * A tarball file from tarlz(1). Supported extensions: .tar.lz, + • A tarball file from tarlz(1). Supported extensions: .tar.lz, .tlz - * Zip files from unzip(1). Supported extensions: .zip, .ZIP + • Zip files from unzip(1). Supported extensions: .zip, .ZIP - * Gzip files from gzip(1). Supported extensions: .gz, .Z + • Gzip files from gzip(1). Supported extensions: .gz, .Z - * Bzip2 files from bzip2(1). Supported extension: .bz2 + • Bzip2 files from bzip2(1). Supported extension: .bz2 - * Lzip files from lzip(1). Supported extension: .lz + • Lzip files from lzip(1). Supported extension: .lz - * Xz files from xz(1). Supported extension: .xz + • Xz files from xz(1). Supported extension: .xz - * Zstd files from zstd(1). Supported extension: .zst + • Zstd files from zstd(1). Supported extension: .zst -'4' +‘4’ File empty, not regular, or expected. - It's commonly expected: + It’s commonly expected: - * An argument for giving commands. + • An argument for giving commands. - * A regular file or readable directory. + • A regular file or readable directory. - * An expected extension: .tlz, .sha256, .order. + • An expected extension: .tlz, .sha256, .order. - * A protocol supported by the network downloader tool. + • A protocol supported by the network downloader tool. -'5' +‘5’ Empty or not defined variable: This code is used to report empty or undefined variables (usually variables coming from a recipe or assigned arrays that are tested). -'6' +‘6’ Package already installed: The package directory for an incoming .tlz package already exists. -'10' +‘10’ Network manager error: This code is used if the network downloader tool fails for some @@ -1158,25 +1158,25 @@ Index  Tag Table: -Node: Top567 -Node: Introduction to Qi1551 -Node: Invoking qi2755 -Node: The qirc file7600 -Node: Packages8564 -Ref: Packages-Footnote-116600 -Ref: Packages-Footnote-216702 -Node: Recipes16816 -Ref: Recipes-Footnote-133481 -Ref: Recipes-Footnote-233618 -Node: Order files33764 -Node: Creating packages35085 -Node: Examining packages36073 -Node: Qi exit status36991 -Node: Index39000 +Node: Top568 +Node: Introduction to Qi1549 +Node: Invoking qi2753 +Node: The qirc file7862 +Node: Packages8862 +Ref: Packages-Footnote-116996 +Ref: Packages-Footnote-217098 +Node: Recipes17212 +Ref: Recipes-Footnote-134349 +Ref: Recipes-Footnote-234490 +Node: Order files34640 +Node: Creating packages35969 +Node: Examining packages36961 +Node: Qi exit status37883 +Node: Index39954  End Tag Table  Local Variables: -coding: iso-8859-1 +coding: utf-8 End: diff --git a/qi/etc/qirc.in b/qi/etc/qirc.in index 49e99484..889b2702 100644 --- a/qi/etc/qirc.in +++ b/qi/etc/qirc.in @@ -36,16 +36,16 @@ #TMPDIR=/usr/src/qi/build # C compiler flags (to be used on CFLAGS) -#QICFLAGS="-O2" +#QICFLAGS="@QICFLAGS@" # C++ compiler flags (to be used on CXXFLAGS) -#QICXXFLAGS="-O2" +#QICXXFLAGS="@QICXXFLAGS@" # Flags for the linker (to be used on LDFLAGS) -#QILDFLAGS="" +#QILDFLAGS="@QILDFLAGS@" # C/C++ preprocessor flags (to be used on CPPFLAGS) -#QICPPFLAGS="" +#QICPPFLAGS="@QICPPFLAGS@" # Time of the last modification to the source code #SOURCE_DATE_EPOCH=$(date +%s) diff --git a/qi/src/qi.in b/qi/src/qi.in index 15f73c22..0ef31a4b 100644 --- a/qi/src/qi.in +++ b/qi/src/qi.in @@ -1,5 +1,5 @@ #! /bin/sh - -# Copyright (C) 2016-2023 Matias Fonzo +# Copyright (C) 2016-2024 Matias Fonzo # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1088,68 +1088,55 @@ unpack() do case $file in *.tar) - tar -tf "$file" > /dev/null && \ - tar -xpf "$file" + tar -tf "$file" > /dev/null && tar -xpf "$file" chkstatus_or_exit 3 ;; *.tar.gz | *.tgz | *.tar.Z ) - gzip -cd "$file" | tar -tf - > /dev/null && \ - gzip -cd "$file" | tar -xpf - + gzip -cd "$file" | tar -tf - > /dev/null && gzip -cd "$file" | tar -xpf - chkstatus_or_exit 3 ;; *.tar.bz2 | *.tbz2 | *.tbz ) - bzip2 -cd "$file" | tar -tf - > /dev/null && \ - bzip2 -cd "$file" | tar -xpf - + bzip2 -cd "$file" | tar -tf - > /dev/null && bzip2 -cd "$file" | tar -xpf - chkstatus_or_exit 3 ;; *.tar.lz | *.tlz ) - lzip -cd "$file" | tar -tf - > /dev/null && \ - lzip -cd "$file" | tar -xpf - + lzip -cd "$file" | tar -tf - > /dev/null && lzip -cd "$file" | tar -xpf - chkstatus_or_exit 3 ;; *.tar.xz | *.txz ) - xz -cd "$file" | tar -tf - > /dev/null && \ - xz -cd "$file" | tar -xpf - + xz -cd "$file" | tar -tf - > /dev/null && xz -cd "$file" | tar -xpf - chkstatus_or_exit 3 ;; *.tar.zst | *.tzst ) - zstd -cd "$file" | tar -tf - > /dev/null && \ - zstd -cd "$file" | tar -xpf - + zstd -cd "$file" | tar -tf - > /dev/null && zstd -cd "$file" | tar -xpf - chkstatus_or_exit 3 ;; *.zip | *.ZIP ) - unzip -t "$file" > /dev/null && \ - unzip "$file" > /dev/null + unzip -t "$file" > /dev/null && unzip "$file" > /dev/null chkstatus_or_exit 3 ;; *.gz) - gzip -t "$file" && \ - gzip -cd "$file" > "$(basename -- "$file" .gz)" + gzip -t "$file" && gzip -cd "$file" > "$(basename -- "$file" .gz)" chkstatus_or_exit 3 ;; *.Z) - gzip -t "$file" && \ - gzip -cd "$file" > "$(basename -- "$file" .Z)" + gzip -t "$file" && gzip -cd "$file" > "$(basename -- "$file" .Z)" chkstatus_or_exit 3 ;; *.bz2) - bzip2 -t "$file" && \ - bzip2 -cd "$file" > "$(basename -- "$file" .bz2)" + bzip2 -t "$file" && bzip2 -cd "$file" > "$(basename -- "$file" .bz2)" chkstatus_or_exit 3 ;; *.lz) - lzip -t "$file" && \ - lzip -cd "$file" > "$(basename -- "$file" .lz)" + lzip -t "$file" && lzip -cd "$file" > "$(basename -- "$file" .lz)" chkstatus_or_exit 3 ;; *.xz) - xz -t "$file" && \ - xz -cd "$file" > "$(basename -- "$file" .xz)" + xz -t "$file" && xz -cd "$file" > "$(basename -- "$file" .xz)" chkstatus_or_exit 3 ;; *.zst) - zstd -qt "$file" && \ - zstd -cd "$file" > "$(basename -- "$file" .zst)" + zstd -qt "$file" && zstd -cd "$file" > "$(basename -- "$file" .zst)" chkstatus_or_exit 3 ;; *) @@ -1226,10 +1213,10 @@ _isUpgrade=_isUpgrade.off keep_srcdir="" keep_destdir="" TMPDIR="${TMPDIR:-/usr/src/qi/build}" -QICFLAGS="${QICFLAGS:--O2}" -QICXXFLAGS="${QICXXFLAGS:--O2}" -QILDFLAGS="${QILDFLAGS:-}" -QICPPFLAGS="${QICPPFLAGS:-}" +QICFLAGS="${QICFLAGS:-@QICFLAGS@}" +QICXXFLAGS="${QICXXFLAGS:-@QICXXFLAGS@}" +QILDFLAGS="${QILDFLAGS:-@QILDFLAGS@}" +QICPPFLAGS="${QICPPFLAGS:-@QICPPFLAGS@}" worktree=/usr/src/qi tardir=${worktree}/sources outdir=@OUTDIR@ @@ -1463,8 +1450,7 @@ do "QI_OUTDIR=$outdir" exit 0 ;; - --help | --hel | --he | --h | '--?' | -help | -hel | -he | -h | '-?' | \ - help ) + --help | --hel | --he | --h | '--?' | -help | -hel | -he | -h | '-?' | help ) usage exit 0 ;; diff --git a/recipes/tools/qi/recipe b/recipes/tools/qi/recipe index d6ae912d..00389f25 100644 --- a/recipes/tools/qi/recipe +++ b/recipes/tools/qi/recipe @@ -1,6 +1,6 @@ # Build recipe for qi. # -# Copyright (c) 2017-2023 Matias Fonzo, . +# Copyright (c) 2017-2024 Matias Fonzo, . # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ set -e program=qi -version=2.12-rc2 +version=2.12 arch=noarch release=1 @@ -115,7 +115,11 @@ build() --docdir=/usr/share/doc \ --packagedir=/usr/pkg \ --targetdir=/ \ - --arch="${package_arch:-$(uname -m)}" + --arch="${package_arch:-$(uname -m)}" \ + --qi-cflags="$QICFLAGS" \ + --qi-cxxflags="$QICXXFLAGS" \ + --qi-ldflags="$QILDFLAGS" \ + --qi-cppflags="$QICPPFLAGS" unset -v package_arch make -j${jobs} DESTDIR="$destdir" install diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index 872dbb39..76be02a4 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -138,7 +138,7 @@ https://dragora.mirror.garr.it/current/sources/lpppd-20210106_7454257.tar.lz https://dragora.mirror.garr.it/current/sources/musl-compat-20210503_77a1509.tar.lz https://dragora.mirror.garr.it/current/sources/perp-2.07.tar.gz https://dragora.mirror.garr.it/current/sources/pygobject-20220808_4b421597.tar.lz -https://dragora.mirror.garr.it/current/sources/qi-2.12-rc2.tar.lz +https://dragora.mirror.garr.it/current/sources/qi-2.12.tar.lz https://dragora.mirror.garr.it/current/sources/sdl12-compat-20221220_2bc46a0.tar.lz https://dragora.mirror.garr.it/current/sources/shared-mime-info-20221214_a2ffb28.tar.lz https://dragora.mirror.garr.it/current/sources/spacefm-20180304_e6f2918.tar.lz diff --git a/sources/qi-2.12-rc2.tar.lz.sha256 b/sources/qi-2.12-rc2.tar.lz.sha256 deleted file mode 100644 index 48c3d002..00000000 --- a/sources/qi-2.12-rc2.tar.lz.sha256 +++ /dev/null @@ -1 +0,0 @@ -63babf9974f8b8b7f1e4fb0537f53a9d3115e8a1ca1e950648769880c25084d5 qi-2.12-rc2.tar.lz diff --git a/sources/qi-2.12.tar.lz.sha256 b/sources/qi-2.12.tar.lz.sha256 new file mode 100644 index 00000000..25b3085a --- /dev/null +++ b/sources/qi-2.12.tar.lz.sha256 @@ -0,0 +1 @@ +131e3cb61ac5d4bbb41c010e7510bc36e8993db624e907ee75604c759fa9cfe6 qi-2.12.tar.lz diff --git a/stages/1/17-qi b/stages/1/17-qi index cdd11e38..4bf48171 100755 --- a/stages/1/17-qi +++ b/stages/1/17-qi @@ -18,6 +18,28 @@ echo "Making Qi from ${worktree}/qi ..." cd -- "${worktree}/qi" +# Set default compiler options for Dragora +case $arch in +i586) + package_cflags="-O2 -march=pentium-mmx -mtune=pentiumpro -fstack-clash-protection -fstack-protector-strong --param=ssp-buffer-size=4 -pipe" + package_cxxflags="$package_cflags" + package_ldflags="-s" + package_cppflags="-D_FORTIFY_SOURCE=2" + ;; +x86_64) + package_cflags="-fPIC -O2 -mtune=generic -fstack-clash-protection -fcf-protection=full -fstack-protector-strong --param=ssp-buffer-size=4 -pipe" + package_cxxflags="$package_cflags" + package_ldflags="-s" + package_cppflags="-D_FORTIFY_SOURCE=2" + ;; +*) + package_cflags="-O2 -fstack-protector-strong --param=ssp-buffer-size=4 -pipe" + package_cxxflags="$package_cflags" + package_ldflags="-s" + package_cppflags="-D_FORTIFY_SOURCE=2" + ;; +esac + make -j1 clean ./configure \ @@ -25,7 +47,13 @@ make -j1 clean --localstatedir=/var \ --packagedir=/usr/pkg \ --targetdir=/ \ - --arch=$package_arch + --arch=$package_arch \ + --qi-cflags="$package_cflags" \ + --qi-cxxflags="$package_cxxflags" \ + --qi-ldflags="$package_ldflags" \ + --qi-cppflags="$package_cppflags" + +unset -v package_cflags package_cxxflags package_ldflags package_cppflags make -j1 install @@ -43,34 +71,6 @@ sed -i \ -e 's|/usr/etc|/etc|' \ /tools/etc/qirc -# Set default compiler options for Dragora -case $arch in -i586) - sed -i \ - -e 's|#QICFLAGS=.*|QICFLAGS=\"-O2 -march=pentium-mmx -mtune=pentiumpro -fstack-clash-protection -fstack-protector-strong --param=ssp-buffer-size=4 -pipe\"|' \ - -e 's|#QICXXFLAGS=.*|QICXXFLAGS=\"-O2 -march=pentium-mmx -mtune=pentiumpro -fstack-clash-protection -fstack-protector-strong --param=ssp-buffer-size=4 -pipe\"|' \ - -e 's|#QILDFLAGS=.*|QILDFLAGS=\"-s\"|' \ - -e 's|#QICPPFLAGS=.*|QICPPFLAGS=\"-D_FORTIFY_SOURCE=2\"|' \ - /tools/etc/qirc - ;; -x86_64) - sed -i \ - -e 's|#QICFLAGS=.*|QICFLAGS=\"-fPIC -O2 -mtune=generic -fstack-clash-protection -fcf-protection=full -fstack-protector-strong --param=ssp-buffer-size=4 -pipe\"|' \ - -e 's|#QICXXFLAGS=.*|QICXXFLAGS=\"-fPIC -O2 -mtune=generic -fstack-clash-protection -fcf-protection=full -fstack-protector-strong --param=ssp-buffer-size=4 -pipe\"|' \ - -e 's|#QILDFLAGS=.*|QILDFLAGS=\"-s\"|' \ - -e 's|#QICPPFLAGS=.*|QICPPFLAGS=\"-D_FORTIFY_SOURCE=2\"|' \ - /tools/etc/qirc - ;; -*) - sed -i \ - -e 's|#QICFLAGS=.*|QICFLAGS=\"-O2 -fstack-protector-strong --param=ssp-buffer-size=4 -pipe\"|' \ - -e 's|#QICXXFLAGS=.*|QICXXFLAGS=\"-O2 -fstack-protector-strong --param=ssp-buffer-size=4 -pipe\"|' \ - -e 's|#QILDFLAGS=.*|QILDFLAGS=\"-s\"|' \ - -e 's|#QICPPFLAGS=.*|QICPPFLAGS=\"-D_FORTIFY_SOURCE=2\"|' \ - /tools/etc/qirc - ;; -esac - # Include additional settings from targets/ # We prefix '--enable-multilib' for targets supporting it, -- 2.11.4.GIT