Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux/make-bootstrap-tools: Add support for a real XZ and HTTPS in curl #8081

Closed
wants to merge 10 commits into from
Closed

linux/make-bootstrap-tools: Add support for a real XZ and HTTPS in curl #8081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
491b684
linux/make-bootstrap-tools: Only copy needed runtime libraries for to…
wkennington May 31, 2015
b9cceff
linux/make-boostrap-tools: Add a real version of XZ as it has minimal…
wkennington May 31, 2015
d320ecd
linux/make-bootstrap-tools: Add support for ssl to curl
wkennington May 31, 2015
e46b130
linux/make-bootstrap-tools-cross: Port the patches
wkennington May 31, 2015
54e74bc
busyboxBootstrap: Build on hydra
wkennington May 31, 2015
0df632e
coreutils: Just use the default as it doesn't much space
wkennington May 31, 2015
495fbc0
busyboxBootstrap: Use glibc instead of musl as it is broken for many …
wkennington May 31, 2015
477c83b
make-bootstrap-tools-cross: Fix the method for determining shared lib…
wkennington Jun 1, 2015
2e3773a
make-bootstrap-tools-cross: Fix the method for determining shared lib…
wkennington Jun 1, 2015
b32f310
make-bootstrap-tools-cross: Add strangely missing rpath for libmpc
wkennington Jun 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 60 additions & 47 deletions pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,33 +82,17 @@ let
libmpc = pkgs.libmpc.crossDrv;
binutils = pkgs.binutils.crossDrv;
libelf = pkgs.libelf.crossDrv;
curl-light = pkgs.curl-light.crossDrv;
xz = pkgs.xz.crossDrv;
cacert = pkgs.cacert.crossDrv;
coreutils = pkgs.coreutils.crossDrv;
busyboxBootstrap = pkgs.busyboxBootstrap.crossDrv;

readelf = "${binutilsCross}/bin/${selectedCrossSystem.crossSystem.config}-readelf";

in

rec {

# We want coreutils without ACL support.
coreutilsMinimal = (pkgs.coreutils.override (args: {
aclSupport = false;
})).crossDrv;

curl-light = pkgs.curl-light.crossDrv;

busyboxMinimal = (pkgs.busybox.override {
# TBD: uClibc is broken.
# useUclibc = true;
enableStatic = true;
enableMinimal = true;
extraConfig = ''
CONFIG_ASH y
CONFIG_ASH_BUILTIN_ECHO y
CONFIG_ASH_BUILTIN_TEST y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y
CONFIG_MKDIR y
CONFIG_TAR y
CONFIG_UNXZ y
'';
}).crossDrv;

inherit pkgs;

Expand All @@ -122,11 +106,11 @@ rec {
crossConfig = stdenv.cross.config;

buildCommand = ''
set -x
set -x
mkdir -p $out/bin $out/lib $out/libexec

# Copy what we need of Glibc.
cp -d ${glibc}/lib/ld-*.so* $out/lib
cp -d ${glibc}/lib/ld*.so* $out/lib
cp -d ${glibc}/lib/libc*.so* $out/lib
cp -d ${glibc}/lib/libc_nonshared.a $out/lib
cp -d ${glibc}/lib/libm*.so* $out/lib
Expand All @@ -138,20 +122,20 @@ rec {
cp -d ${glibc}/lib/libnss*.so* $out/lib
cp -d ${glibc}/lib/libresolv*.so* $out/lib
cp -d ${glibc}/lib/crt?.o $out/lib

cp -rL ${glibc}/include $out
chmod -R u+w $out/include

# Hopefully we won't need these.
rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video
find $out/include -name .install -exec rm {} \;
find $out/include -name ..install.cmd -exec rm {} \;
mv $out/include $out/include-glibc

# Copy coreutils, bash, etc.
cp ${coreutilsMinimal}/bin/* $out/bin
cp ${coreutils}/bin/* $out/bin
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)

cp ${bash}/bin/bash $out/bin
cp ${findutils}/bin/find $out/bin
cp ${findutils}/bin/xargs $out/bin
Expand All @@ -163,14 +147,16 @@ rec {
cp ${gnutar}/bin/tar $out/bin
cp ${gzip}/bin/gzip $out/bin
cp ${bzip2}/bin/bzip2 $out/bin
cp ${xz}/bin/xz $out/bin
cp -d ${gnumake}/bin/* $out/bin
cp -d ${patch}/bin/* $out/bin
cp ${patchelf}/bin/* $out/bin
cp ${curl-light}/bin/curl $out/bin
cp -d ${curl-light}/lib/libcurl* $out/lib

cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep

# Add ca certificates for curl
mkdir -p $out/etc/ssl/certs
cp -d ${cacert}/ca-bundle.crt $out/etc/ssl/certs

# Copy what we need of GCC.
cp -d ${gcc}/bin/gcc $out/bin
cp -d ${gcc}/bin/cpp $out/bin
Expand All @@ -194,25 +180,52 @@ rec {
rm -rf $out/include/c++/*/ext/pb_ds
rm -rf $out/include/c++/*/ext/parallel

cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
cp -d ${libmpc}/lib/libmpc*.so* $out/lib
cp -d ${zlib}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib

# TBD: Why are these needed for cross but not native tools?
cp -d ${cloogppl}/lib/libcloog*.so* $out/lib
cp -d ${cloog}/lib/libcloog*.so* $out/lib
cp -d ${isl}/lib/libisl*.so* $out/lib

# Copy binutils.
for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils}/bin/$i $out/bin
done
cp -d ${binutils}/lib/lib*.so* $out/lib

# Copy all of the needed libraries for the binaries
copy_libs_in_elf() {
local BIN=$1

# Determine what libraries are needed by the elf
RELF="$(${readelf} -a $BIN 2>&1)" || continue
RPATH="$(echo "$RELF" | grep rpath | sed 's,.*\[\([^]]*\)\].*,\1,')"
LIBS="$(echo "$RELF" | grep 'Shared library' | sed 's,.*\[\([^]]*\)\].*,\1,')"
for LIB in $LIBS; do
# Find the libraries on the system
for LIBPATH in $(echo "$RPATH:${libmpc}/lib" | tr ':' ' '); do
if [ -f "$LIBPATH/$LIB" ]; then
LIB="$LIBPATH/$LIB"
break
fi
done

# Copy the library and possibly symlinks
while [ ! -f "$out/lib/$(basename $LIB)" ]; do
LINK="$(readlink $LIB)" || true
if [ -z "$LINK" ]; then
cp -pdv $LIB $out/lib
copy_libs_in_elf $LIB
break
else
ln -sv "$(basename $LINK)" "$out/lib/$(basename $LIB)"
if [ "${LINK:0:1}" != "/" ]; then
LINK="$(dirname $LIB)/$LINK"
fi
LIB="$LINK"
fi
done
done
}
for BIN in $out/bin/* $out/libexec/gcc/*/*/*; do
echo "Copying libs for bin $BIN"
copy_libs_in_elf $BIN
done

chmod -R u+w $out

# Strip executables even further.
for i in $out/bin/* $out/libexec/gcc/*/*/*; do
if test -x $i -a ! -L $i; then
Expand All @@ -231,7 +244,7 @@ rec {

mkdir $out/on-server
tar cvfJ $out/on-server/bootstrap-tools.tar.xz -C $out/pack .
cp ${busyboxMinimal}/bin/busybox $out/on-server
cp ${busyboxBootstrap}/bin/busybox $out/on-server
chmod u+w $out/on-server/busybox
nuke-refs $out/on-server/busybox
''; # */
Expand Down
56 changes: 24 additions & 32 deletions pkgs/stdenv/linux/make-bootstrap-tools.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,6 @@ with import ../../top-level/all-packages.nix {inherit system;};

rec {


# We want coreutils without ACL support.
coreutilsMinimal = coreutils.override (args: {
aclSupport = false;
});

busyboxMinimal = busybox.override {
useMusl = true;
enableStatic = true;
enableMinimal = true;
extraConfig = ''
CONFIG_ASH y
CONFIG_ASH_BUILTIN_ECHO y
CONFIG_ASH_BUILTIN_TEST y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y
CONFIG_MKDIR y
CONFIG_TAR y
CONFIG_UNXZ y
'';
};

build =

stdenv.mkDerivation {
Expand Down Expand Up @@ -60,7 +39,7 @@ rec {
mv $out/include $out/include-glibc

# Copy coreutils, bash, etc.
cp ${coreutilsMinimal}/bin/* $out/bin
cp ${coreutils}/bin/* $out/bin
(cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users)

cp ${bash}/bin/bash $out/bin
Expand All @@ -74,13 +53,15 @@ rec {
cp ${gnutar}/bin/tar $out/bin
cp ${gzip}/bin/gzip $out/bin
cp ${bzip2}/bin/bzip2 $out/bin
cp ${xz}/bin/xz $out/bin
cp -d ${gnumake}/bin/* $out/bin
cp -d ${patch}/bin/* $out/bin
cp ${patchelf}/bin/* $out/bin
cp ${curl-light}/bin/curl $out/bin
cp -d ${curl-light}/lib/libcurl* $out/lib

cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
# Add ca certificates for curl
mkdir -p $out/etc/ssl/certs
cp -d ${cacert}/ca-bundle.crt $out/etc/ssl/certs

# Copy what we need of GCC.
cp -d ${gcc.cc}/bin/gcc $out/bin
Expand All @@ -105,17 +86,28 @@ rec {
rm -rf $out/include/c++/*/ext/pb_ds
rm -rf $out/include/c++/*/ext/parallel

cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
cp -d ${libmpc}/lib/libmpc*.so* $out/lib
cp -d ${zlib}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib

# Copy binutils.
for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils}/bin/$i $out/bin
done
cp -d ${binutils}/lib/lib*.so* $out/lib

# Copy all of the needed libraries for the binaries
for BIN in $(find $out/bin -type f); do
echo "Copying libs for bin $BIN"
LDD="$(ldd $BIN)" || continue
LIBS="$(echo "$LDD" | awk '{print $3}' | sed '/^$/d')"
for LIB in $LIBS; do
[ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib
while [ "$(readlink $LIB)" != "" ]; do
LINK="$(readlink $LIB)"
if [ "${LINK:0:1}" != "/" ]; then
LINK="$(dirname $LIB)/$LINK"
fi
LIB="$LINK"
[ ! -f "$out/lib/$(basename $LIB)" ] && cp -pdv $LIB $out/lib
done
done
done

chmod -R u+w $out

Expand All @@ -137,7 +129,7 @@ rec {

mkdir $out/on-server
tar cvfJ $out/on-server/bootstrap-tools.tar.xz -C $out/pack .
cp ${busyboxMinimal}/bin/busybox $out/on-server
cp ${busyboxBootstrap}/bin/busybox $out/on-server
chmod u+w $out/on-server/busybox
nuke-refs $out/on-server/busybox
''; # */
Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/networking/curl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let

# Normal Depedencies
optZlib = if isLight then null else shouldUsePkg zlib;
optOpenssl = if isLight then null else shouldUsePkg openssl;
optOpenssl = shouldUsePkg openssl;
optLibssh2 = if isLight then null else shouldUsePkg libssh2;
optLibnghttp2 = if isLight then null else shouldUsePkg libnghttp2;
optC-ares = if isLight then null else shouldUsePkg c-ares;
Expand Down
15 changes: 15 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9220,6 +9220,21 @@ let

busybox = callPackage ../os-specific/linux/busybox { };

busyboxBootstrap = busybox.override {
useMusl = false; # Broken for all systems except x86_64-linux
enableStatic = true;
enableMinimal = true;
extraConfig = ''
CONFIG_ASH y
CONFIG_ASH_BUILTIN_ECHO y
CONFIG_ASH_BUILTIN_TEST y
CONFIG_ASH_OPTIMIZE_FOR_SIZE y
CONFIG_MKDIR y
CONFIG_TAR y
CONFIG_UNXZ y
'';
};

cgmanager = callPackage ../os-specific/linux/cgmanager { };

checkpolicy = callPackage ../os-specific/linux/checkpolicy { };
Expand Down