Skip to content

Commit d3133b4

Browse files
QuLogicQuLogic
committed
Fix update script
Apparently, Apple moved to hosting on GitHub, though they still tag their commits with tag=`$repo-$version`. When GitHub produces a tarball, it then makes `$repo-$tag` == `$repo-$repo-$version`.
1 parent ebb736f commit d3133b4

File tree

1 file changed

+60
-60
lines changed

1 file changed

+60
-60
lines changed

‎update.sh

+60-60
Original file line numberDiff line numberDiff line change
@@ -9,76 +9,76 @@ set -e
99
. ./versions.inc
1010

1111
# Prepare some utility variables, used below.
12-
Libc=Libc-$Libc_version
13-
xnu=xnu-$xnu_version
14-
AvailabilityVersions=AvailabilityVersions-$AvailabilityVersions_version
15-
libmalloc=libmalloc-$libmalloc_version
16-
libpthread=libpthread-$libpthread_version
17-
CarbonHeaders=CarbonHeaders-$CarbonHeaders_version
18-
Libm=Libm-$Libm_version
12+
Libc="Libc-$Libc_version"
13+
xnu="xnu-$xnu_version"
14+
AvailabilityVersions="AvailabilityVersions-$AvailabilityVersions_version"
15+
libmalloc="libmalloc-$libmalloc_version"
16+
libpthread="libpthread-$libpthread_version"
17+
CarbonHeaders="CarbonHeaders-$CarbonHeaders_version"
18+
Libm="Libm-$Libm_version"
1919
sysroot=src
20-
include=$sysroot/usr/include
20+
include="$sysroot/usr/include"
2121

2222
# Download libraries (if needed).
2323
wget -P download --no-clobber --no-verbose \
24-
https://opensource.apple.com/tarballs/AvailabilityVersions/$AvailabilityVersions.tar.gz \
25-
https://opensource.apple.com/tarballs/CarbonHeaders/$CarbonHeaders.tar.gz \
26-
https://opensource.apple.com/tarballs/Libc/$Libc.tar.gz \
27-
https://opensource.apple.com/tarballs/Libm/$Libm.tar.gz \
28-
https://opensource.apple.com/tarballs/libpthread/$libpthread.tar.gz \
29-
https://opensource.apple.com/tarballs/libmalloc/$libmalloc.tar.gz \
30-
https://opensource.apple.com/tarballs/xnu/$xnu.tar.gz
24+
"https://opensource.apple.com/tarballs/AvailabilityVersions/$AvailabilityVersions.tar.gz" \
25+
"https://opensource.apple.com/tarballs/CarbonHeaders/$CarbonHeaders.tar.gz" \
26+
"https://opensource.apple.com/tarballs/Libc/$Libc.tar.gz" \
27+
"https://opensource.apple.com/tarballs/Libm/$Libm.tar.gz" \
28+
"https://opensource.apple.com/tarballs/libpthread/$libpthread.tar.gz" \
29+
"https://opensource.apple.com/tarballs/libmalloc/$libmalloc.tar.gz" \
30+
"https://opensource.apple.com/tarballs/xnu/$xnu.tar.gz"
3131

3232
# Extract source files.
3333
# Order matters: some files are duplicated in different tarballs.
3434
rm -rf $include
3535
mkdir -p $include/sys
3636
mkdir -p $sysroot/usr/local/libexec
37-
tar -C $sysroot/usr/local/libexec --strip-components=1 -xf download/$AvailabilityVersions.tar.gz $AvailabilityVersions/availability.pl
38-
tar -C $include --strip-components=1 -xf download/$CarbonHeaders.tar.gz $CarbonHeaders/TargetConditionals.h
39-
tar -C $include --strip-components=2 -xf download/$Libc.tar.gz $Libc/include
40-
tar -C $include --strip-components=3 -xf download/$Libm.tar.gz $Libm/Source/Intel/math.h
41-
tar -C $include --strip-components=2 -xf download/$libmalloc.tar.gz $libmalloc/include/malloc
42-
tar -C $include/sys --strip-components=3 -xf download/$libpthread.tar.gz $libpthread/include/sys/_pthread
43-
tar -C $include --strip-components=3 -xf download/$xnu.tar.gz $xnu/libsyscall/wrappers/gethostuuid.h
44-
tar -C $include --strip-components=2 -xf download/$xnu.tar.gz $xnu/bsd/arm/endian.h \
45-
$xnu/bsd/arm/_mcontext.h \
46-
$xnu/bsd/arm/types.h \
47-
$xnu/bsd/i386/endian.h \
48-
$xnu/bsd/i386/_mcontext.h \
49-
$xnu/bsd/i386/types.h \
50-
$xnu/bsd/machine/endian.h \
51-
$xnu/bsd/machine/_mcontext.h \
52-
$xnu/bsd/machine/types.h \
53-
$xnu/bsd/sys/appleapiopts.h \
54-
$xnu/bsd/sys/cdefs.h \
55-
$xnu/bsd/sys/dirent.h \
56-
$xnu/bsd/sys/_endian.h \
57-
$xnu/bsd/sys/errno.h \
58-
$xnu/bsd/sys/fcntl.h \
59-
$xnu/bsd/sys/make_symbol_aliasing.sh \
60-
$xnu/bsd/sys/make_posix_availability.sh \
61-
$xnu/bsd/sys/mman.h \
62-
$xnu/bsd/sys/resource.h \
63-
$xnu/bsd/sys/signal.h \
64-
$xnu/bsd/sys/select.h \
65-
$xnu/bsd/sys/_select.h \
66-
$xnu/bsd/sys/stat.h \
67-
$xnu/bsd/sys/stdio.h \
68-
$xnu/bsd/sys/_types \
69-
$xnu/bsd/sys/types.h \
70-
$xnu/bsd/sys/_types.h \
71-
$xnu/bsd/sys/unistd.h \
72-
$xnu/bsd/sys/wait.h \
73-
$xnu/EXTERNAL_HEADERS/Availability.h \
74-
$xnu/EXTERNAL_HEADERS/AvailabilityInternal.h \
75-
$xnu/libkern/libkern/_OSByteOrder.h \
76-
$xnu/libkern/libkern/arm/OSByteOrder.h \
77-
$xnu/libkern/libkern/i386/_OSByteOrder.h \
78-
$xnu/osfmk/arm/arch.h \
79-
$xnu/osfmk/mach/arm/_structs.h \
80-
$xnu/osfmk/mach/i386/_structs.h \
81-
$xnu/osfmk/mach/machine/_structs.h
37+
tar -C $sysroot/usr/local/libexec --strip-components=1 -xf "download/$AvailabilityVersions.tar.gz" "AvailabilityVersions-$AvailabilityVersions/availability.pl"
38+
tar -C $include --strip-components=1 -xf "download/$CarbonHeaders.tar.gz" "CarbonHeaders-$CarbonHeaders/TargetConditionals.h"
39+
tar -C $include --strip-components=2 -xf "download/$Libc.tar.gz" "Libc-$Libc/include"
40+
tar -C $include --strip-components=3 -xf "download/$Libm.tar.gz" "Libm-$Libm/Source/Intel/math.h"
41+
tar -C $include --strip-components=2 -xf "download/$libmalloc.tar.gz" "libmalloc-$libmalloc/include/malloc"
42+
tar -C $include/sys --strip-components=3 -xf "download/$libpthread.tar.gz" "libpthread-$libpthread/include/sys/_pthread"
43+
tar -C $include --strip-components=3 -xf "download/$xnu.tar.gz" "xnu-$xnu/libsyscall/wrappers/gethostuuid.h"
44+
tar -C $include --strip-components=2 -xf "download/$xnu.tar.gz" "xnu-$xnu/bsd/arm/endian.h" \
45+
"xnu-$xnu/bsd/arm/_mcontext.h" \
46+
"xnu-$xnu/bsd/arm/types.h" \
47+
"xnu-$xnu/bsd/i386/endian.h" \
48+
"xnu-$xnu/bsd/i386/_mcontext.h" \
49+
"xnu-$xnu/bsd/i386/types.h" \
50+
"xnu-$xnu/bsd/machine/endian.h" \
51+
"xnu-$xnu/bsd/machine/_mcontext.h" \
52+
"xnu-$xnu/bsd/machine/types.h" \
53+
"xnu-$xnu/bsd/sys/appleapiopts.h" \
54+
"xnu-$xnu/bsd/sys/cdefs.h" \
55+
"xnu-$xnu/bsd/sys/dirent.h" \
56+
"xnu-$xnu/bsd/sys/_endian.h" \
57+
"xnu-$xnu/bsd/sys/errno.h" \
58+
"xnu-$xnu/bsd/sys/fcntl.h" \
59+
"xnu-$xnu/bsd/sys/make_symbol_aliasing.sh" \
60+
"xnu-$xnu/bsd/sys/make_posix_availability.sh" \
61+
"xnu-$xnu/bsd/sys/mman.h" \
62+
"xnu-$xnu/bsd/sys/resource.h" \
63+
"xnu-$xnu/bsd/sys/signal.h" \
64+
"xnu-$xnu/bsd/sys/select.h" \
65+
"xnu-$xnu/bsd/sys/_select.h" \
66+
"xnu-$xnu/bsd/sys/stat.h" \
67+
"xnu-$xnu/bsd/sys/stdio.h" \
68+
"xnu-$xnu/bsd/sys/_types" \
69+
"xnu-$xnu/bsd/sys/types.h" \
70+
"xnu-$xnu/bsd/sys/_types.h" \
71+
"xnu-$xnu/bsd/sys/unistd.h" \
72+
"xnu-$xnu/bsd/sys/wait.h" \
73+
"xnu-$xnu/EXTERNAL_HEADERS/Availability.h" \
74+
"xnu-$xnu/EXTERNAL_HEADERS/AvailabilityInternal.h" \
75+
"xnu-$xnu/libkern/libkern/_OSByteOrder.h" \
76+
"xnu-$xnu/libkern/libkern/arm/OSByteOrder.h" \
77+
"xnu-$xnu/libkern/libkern/i386/_OSByteOrder.h" \
78+
"xnu-$xnu/osfmk/arm/arch.h" \
79+
"xnu-$xnu/osfmk/mach/arm/_structs.h" \
80+
"xnu-$xnu/osfmk/mach/i386/_structs.h" \
81+
"xnu-$xnu/osfmk/mach/machine/_structs.h"
8282

8383
# Generate some files.
8484
$include/sys/make_symbol_aliasing.sh $sysroot $include/sys/_symbol_aliasing.h

0 commit comments

Comments
 (0)