;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu ci)
- #:use-module (guix channels)
+ #:use-module (guix build-system channel)
#:use-module (guix config)
- #:use-module (guix describe)
+ #:autoload (guix describe) (package-channels)
#:use-module (guix store)
#:use-module (guix grafts)
#:use-module (guix profiles)
#:use-module (guix packages)
+ #:autoload (guix transformations) (tunable-package? tuned-package)
#:use-module (guix channels)
#:use-module (guix config)
#:use-module (guix derivations)
- #:use-module (guix build-system)
#:use-module (guix monads)
#:use-module (guix gexp)
#:use-module (guix ui)
#:use-module ((guix licenses)
#:select (gpl3+ license? license-name))
#:use-module ((guix utils) #:select (%current-system))
- #:use-module ((guix scripts system) #:select (read-operating-system))
#:use-module ((guix scripts pack)
- #:select (lookup-compressor self-contained-tarball))
+ #:select (self-contained-tarball))
#:use-module (gnu bootloader)
#:use-module (gnu bootloader u-boot)
+ #:use-module (gnu compression)
#:use-module (gnu image)
#:use-module (gnu packages)
#:use-module (gnu packages gcc)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages make-bootstrap)
#:use-module (gnu packages package-management)
+ #:use-module (guix platform)
#:use-module (gnu system)
#:use-module (gnu system image)
#:use-module (gnu system vm)
#:export (derivation->job
image->job
- %bootstrap-packages
%core-packages
- %cross-targets
- channel-source->package
arguments->systems
cuirass-jobs))
(#:timeout . ,timeout)))
(define* (package-job store job-name package system
- #:key cross? target)
+ #:key cross? target (suffix ""))
"Return a job called JOB-NAME that builds PACKAGE on SYSTEM."
- (let ((job-name (string-append job-name "." system)))
+ (let ((job-name (string-append job-name "." system suffix)))
(parameterize ((%graft? #f))
(let* ((drv (if cross?
(package-cross-derivation store package target system
(define (package-cross-job store job-name package target system)
"Return a job called TARGET.JOB-NAME that cross-builds PACKAGE for TARGET on
SYSTEM."
- (let ((name (string-append target "." job-name "." system)))
+ (let ((name (string-append target "." job-name)))
(package-job store name package system
#:cross? #t
#:target target)))
;; Note: Don't put the '-final' package variants because (1) that's
;; implicit, and (2) they cannot be cross-built (due to the explicit input
;; chain.)
- (list gcc-7 gcc-8 gcc-9 gcc-10 glibc binutils
+ (list gcc-8 gcc-9 gcc-10 gcc-11 glibc binutils
gmp mpfr mpc coreutils findutils diffutils patch sed grep
- gawk gnu-gettext hello guile-2.0 guile-2.2 zlib gzip xz guix
+ gawk gnu-gettext hello guile-2.2 guile-3.0 zlib gzip xz guix
%bootstrap-binaries-tarball
%binutils-bootstrap-tarball
(%glibc-bootstrap-tarball)
%guile-bootstrap-tarball
%bootstrap-tarballs))
-(define %bootstrap-packages
- ;; Return the list of bootstrap packages from the commencement module.
- (filter package?
- (module-map
- (lambda (sym var)
- (variable-ref var))
- (resolve-module '(gnu packages commencement)))))
+(define (commencement-packages system)
+ "Return the list of bootstrap packages from the commencement module for
+SYSTEM."
+ ;; Only include packages supported on SYSTEM. For example, the Mes
+ ;; bootstrap graph is currently not supported on ARM so it should be
+ ;; excluded.
+ (filter (lambda (obj)
+ (and (package? obj)
+ (supported-package? obj system)))
+ (module-map (lambda (sym var)
+ (variable-ref var))
+ (resolve-module '(gnu packages commencement)))))
(define (packages-to-cross-build target)
"Return the list of packages to cross-build for TARGET."
(drop-right %core-packages 6)
%core-packages))
-(define %cross-targets
- '("mips64el-linux-gnu"
- "arm-linux-gnueabihf"
- "aarch64-linux-gnu"
- "powerpc-linux-gnu"
- "powerpc64le-linux-gnu"
- "riscv64-linux-gnu"
- "i586-pc-gnu" ;aka. GNU/Hurd
- "i686-w64-mingw32"
- "x86_64-w64-mingw32"))
-
(define (cross-jobs store system)
"Return a list of cross-compilation jobs for SYSTEM."
(define (from-32-to-64? target)
package target system))
(packages-to-cross-build target)))
(remove (either from-32-to-64? same? pointless?)
- %cross-targets)))
+ (targets))))
(define* (guix-jobs store systems #:key source commit)
"Return a list of jobs for Guix itself."
(parameterize ((%graft? #f))
(derivation->job name drv))))
-(define (image-jobs store system)
+(define* (image-jobs store system
+ #:key source commit)
"Return a list of jobs that build images for SYSTEM."
(define MiB
(expt 2 20))
- (if (member system %guix-system-supported-systems)
- `(,(image->job store
- (image
- (inherit efi-disk-image)
- (operating-system installation-os))
- #:name "usb-image"
- #:system system)
- ,(image->job
- store
- (image
- (inherit (image-with-label
- iso9660-image
- (string-append "GUIX_" system "_"
- (if (> (string-length %guix-version) 7)
- (substring %guix-version 0 7)
- %guix-version))))
- (operating-system installation-os))
- #:name "iso9660-image"
- #:system system)
- ;; Only cross-compile Guix System images from x86_64-linux for now.
- ,@(if (string=? system "x86_64-linux")
- (map (cut image->job store <>
- #:system system)
- %guix-system-images)
- '()))
- '()))
-
-(define channel-build-system
- ;; Build system used to "convert" a channel instance to a package.
- (let* ((build (lambda* (store name inputs
- #:key source commit system
- #:allow-other-keys)
- (run-with-store store
- ;; SOURCE can be a lowerable object such as <local-file>
- ;; or a file name. Adjust accordingly.
- (mlet* %store-monad ((source (if (string? source)
- (return source)
- (lower-object source)))
- (instance
- -> (checkout->channel-instance
- source #:commit commit)))
- (channel-instances->derivation (list instance)))
- #:system system)))
- (lower (lambda* (name #:key system source commit
- #:allow-other-keys)
- (bag
- (name name)
- (system system)
- (build build)
- (arguments `(#:source ,source
- #:commit ,commit))))))
- (build-system (name 'channel)
- (description "Turn a channel instance into a package.")
- (lower lower))))
-
-(define* (channel-source->package source #:key commit)
- "Return a package for the given channel SOURCE, a lowerable object."
- (package
- (inherit guix)
- (version (string-append (package-version guix) "+"))
- (build-system channel-build-system)
- (arguments `(#:source ,source
- #:commit ,commit))
- (inputs '())
- (native-inputs '())
- (propagated-inputs '())))
+ (parameterize ((current-guix-package
+ (channel-source->package source #:commit commit)))
+ (if (member system %guix-system-supported-systems)
+ `(,(image->job store
+ (image
+ (inherit efi-disk-image)
+ (operating-system installation-os))
+ #:name "usb-image"
+ #:system system)
+ ,(image->job
+ store
+ (image
+ (inherit (image-with-label
+ iso9660-image
+ (string-append "GUIX_" system "_"
+ (if (> (string-length %guix-version) 7)
+ (substring %guix-version 0 7)
+ %guix-version))))
+ (operating-system installation-os))
+ #:name "iso9660-image"
+ #:system system)
+ ;; Only cross-compile Guix System images from x86_64-linux for now.
+ ,@(if (string=? system "x86_64-linux")
+ (map (cut image->job store <>
+ #:system system)
+ %guix-system-images)
+ '()))
+ '())))
(define* (system-test-jobs store system
#:key source commit)
(((_ inputs _ ...) ...)
inputs))))
(%final-inputs)))))
- (lambda (store package system)
+ (lambda* (store package system #:key (suffix ""))
"Return a job for PACKAGE on SYSTEM, or #f if this combination is not
-valid."
+valid. Append SUFFIX to the job name."
(cond ((member package base-packages)
(package-job store (string-append "base." (job-name package))
- package system))
+ package system #:suffix suffix))
((supported-package? package system)
(let ((drv (package-derivation store package system
#:graft? #f)))
(and (substitutable-derivation? drv)
(package-job store (job-name package)
- package system))))
+ package system #:suffix suffix))))
(else
#f)))))
+(define %x86-64-micro-architectures
+ ;; Micro-architectures for which we build tuned variants.
+ '("westmere" "ivybridge" "haswell" "skylake" "skylake-avx512"))
+
+(define (tuned-package-jobs store package system)
+ "Return a list of jobs for PACKAGE tuned for SYSTEM's micro-architectures."
+ (filter-map (lambda (micro-architecture)
+ (define suffix
+ (string-append "." micro-architecture))
+
+ (package->job store
+ (tuned-package package micro-architecture)
+ system
+ #:suffix suffix))
+ (match system
+ ("x86_64-linux" %x86-64-micro-architectures)
+ (_ '()))))
+
(define (all-packages)
"Return the list of packages to build."
(define (adjust package result)
('all
;; Build everything, including replacements.
(let ((all (all-packages))
- (job (lambda (package)
- (package->job store package system))))
+ (jobs (lambda (package)
+ (match (package->job store package system)
+ (#f '())
+ (main-job
+ (cons main-job
+ (if (tunable-package? package)
+ (tuned-package-jobs store package system)
+ '())))))))
(append
- (filter-map job all)
+ (append-map jobs all)
(cross-jobs store system))))
('core
;; Build core packages only.
(map (lambda (package)
(package-job store (job-name package)
package system))
- (append %bootstrap-packages %core-packages))
+ (append (commencement-packages system) %core-packages))
(cross-jobs store system)))
('guix
;; Build Guix modules only.
hello system))))
('images
;; Build Guix System images only.
- (image-jobs store system))
+ (image-jobs store system
+ #:source source
+ #:commit commit))
('system-tests
;; Build Guix System tests only.
(system-test-jobs store system
HCoop / jackhill / guix / guix.git / blobdiff