diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-08-31 16:16:58 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-08-31 17:12:26 +0200 |
| commit | 178ab1cfab6d712cd0460270e8ca4e799d44d5de (patch) | |
| tree | 7197d910d965e90b9e8607c67e82eafe93f6ea0a | |
| parent | 001c859880de24af0c5219a2638fff3100ee5cd2 (diff) | |
| download | hardware_replicant_libsamsung-ril-178ab1cfab6d712cd0460270e8ca4e799d44d5de.tar.gz hardware_replicant_libsamsung-ril-178ab1cfab6d712cd0460270e8ca4e799d44d5de.tar.bz2 hardware_replicant_libsamsung-ril-178ab1cfab6d712cd0460270e8ca4e799d44d5de.zip | |
guix.scm: replicant-6-libhardware_legacy: fix upack-core
Without that fix we have the following error that make the build fail:
[...]
phase `unpack' succeeded after 0.1 seconds
starting phase `unpack-core'
tar: /gnu/store/[...]-android-platform-system-core-7.1.2_r36-checkout:
Cannot read: Is a directory
tar: At beginning of tape, quitting now
tar: Error is not recoverable: exiting now
[...]
This is probably because for some reasons there is no more tarball of
it being made, so we have to copy the data instead of extracting it.
In guix a similar fix was made in commit
e227b0820a93c4a264a169895948d6d2c0c37005 ("gnu: android-ext4-utils:
Fix build.").
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | scripts/guix.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/scripts/guix.scm b/scripts/guix.scm index 04a79a4..006b980 100644 --- a/scripts/guix.scm +++ b/scripts/guix.scm @@ -191,7 +191,7 @@ (list (string-append "CFLAGS= " ;; TODO: see the comment below about - ;; unpacking android-core tarball. + ;; copying the android-core source code. ;; Uncomment the following lines and ;; remove -I ../core/include when ;; this is fixed: @@ -203,15 +203,13 @@ %standard-phases ;; TODO: Guix's android.scm does that too in android-ext4-utils however ;; it might be a good idea to instead package the android-code source - ;; code as-is instead of just downloading it as a tarball + ;; code as-is and refer to it instead of just copyring it locally (add-after 'unpack 'unpack-core (lambda* (#:key inputs #:allow-other-keys) (mkdir-p "core") - (with-directory-excursion - "core" - (invoke "tar" "axf" (assoc-ref inputs "android-core") - "--strip-components=1")) + (copy-recursively (assoc-ref inputs "android-core") + "core") #t)) (delete 'bootstrap) (add-before |