diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-29 13:15:08 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-04-29 16:08:56 -0700 |
| commit | 6279bd8b9d742b858a095fbca1159b2cf1df2431 (patch) | |
| tree | 866d96467eb262f896e98eb9032ef24124e7907c /src/property/sbuild.lisp | |
| parent | 2f4355eda82335a7eef5696241f5ff5f6ede3a52 (diff) | |
| download | consfigurator-6279bd8b9d742b858a095fbca1159b2cf1df2431.tar.gz | |
move OS::ARCHITECTURE slot from OS:LINUX to OS:DEBIANLIKE
We already use this information in the sense of a distribution architecture
rather than a kernel architecture, and the latter are differently grained.
We might later want to have slots for both.
Make OS:SUPPORTS-ARCH-P take OS objects as this simplifies existing usage.
Restore the ORIGINAL-OS parameter to INSTALLER:CLEANLY-INSTALLED-ONCE. It was
previously replaced in 446b8f4a8ef78cb4605cfb551255bb455be411f0.
CHROOT::%OS-BOOTSTRAPPER-INSTALLED does not need the original host's
architecture in most cases, and accepting an arbitrary propapp means we don't
force the use of PACKAGE:INSTALLED.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/sbuild.lisp')
| -rw-r--r-- | src/property/sbuild.lisp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/property/sbuild.lisp b/src/property/sbuild.lisp index e0ce023..3a3533d 100644 --- a/src/property/sbuild.lisp +++ b/src/property/sbuild.lisp @@ -52,7 +52,7 @@ exist, so that the user can easily override this default." (debianlike (apt:installed "eatmydata" "ccache")))))))) (os (get-hostattrs-car :os host)) (suite (os:debian-suite os)) - (arch (os:debian-architecture os))) + (arch (os:debian-architecture-string os))) "Build and configure a schroot for use with sbuild. For convenience we set up several enhancements, such as ccache and eatmydata. In the case of Debian, we assume you are building for Debian stretch or newer, @@ -156,8 +156,9 @@ EOF :mode #o755) ;; to avoid more than one schroot getting the same aliases, we ;; only do this if the arch of the chroot equals the host arch. ,@(and (string= suite "unstable") - (string= arch (os:debian-architecture - (get-hostattrs-car :os))) + (string= + arch + (os:debian-architecture-string (get-hostattrs-car :os))) `(("aliases" ,(format nil "~@{~A~^,~}" @@ -172,7 +173,7 @@ EOF :mode #o755) "UNRELEASED" ;; The following is for dgit compatibility. (strcat "UNRELEASED-" - (os:debian-architecture os) + (os:debian-architecture-string os) "-sbuild"))))) ("command-prefix" |