summary refs log tree commit diff
path: root/distro/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-10-24 21:18:37 +0200
committerLudovic Courtès <ludo@gnu.org>2012-10-25 00:58:39 +0200
commit371a20e04870cd98af053dc54e68d22770f136ce (patch)
treef162dedf5e6ab264c00f56107af8bd40cb1ea73d /distro/packages
parent5ab57a13ddaafb89cec1b887797953d430e13948 (diff)
downloadguix-371a20e04870cd98af053dc54e68d22770f136ce.tar.gz
distro: Add missing Linux-Libre headers to the bootstrap glibc.
* distro/packages/base.scm (%glibc-stripped): Copy all of Linux-Libre's
  `include/asm' directory; copy a few linux/ headers too.
  (%bootstrap-glibc): Update tarball hash.
Diffstat (limited to 'distro/packages')
-rw-r--r--distro/packages/base.scm15
1 files changed, 5 insertions, 10 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm
index 84de5281c4..9724f1dd73 100644
--- a/distro/packages/base.scm
+++ b/distro/packages/base.scm
@@ -1558,7 +1558,7 @@ check whether everything is alright."
                                            system "/glibc-2.16.0.tar.xz"))
                        (sha256
                         (base32
-                         "1xamrl1d6y3b0l98gmih4ac8aiqnfps1rhb62z0wxr7chisiqwan"))))))))
+                         "1a6sq876l8x16bi6p0jznhb20kghbvxbp1amsyqp1907by9fg0hn"))))))))
     (description "Bootstrap binaries and headers of the GNU C Library")
     (long-description #f)
     (home-page #f)))
@@ -2374,16 +2374,11 @@ store.")
                                   (string-append incdir "/linux/"
                                                  (basename file))))
                      '("limits.h" "errno.h" "socket.h" "kernel.h"
-                       "sysctl.h" "param.h"))
-
-           (mkdir (string-append incdir "/asm"))
-           (for-each (lambda (file)
-                       (copy-file (string-append linux "/include/asm/" file)
-                                  (string-append incdir "/asm/"
-                                                 (basename file))))
-                     '("types.h" "unistd.h" "ioctls.h" "socket.h"
-                       "param.h" "errno.h"))
+                       "sysctl.h" "param.h" "ioctl.h" "types.h"
+                       "posix_types.h" "stddef.h"))
 
+           (copy-recursively (string-append linux "/include/asm")
+                             (string-append incdir "/asm"))
            (copy-recursively (string-append linux "/include/asm-generic")
                              (string-append incdir "/asm-generic"))
            #t))))