Skip to content

Commit

Permalink
Replace all wget with curl
Browse files Browse the repository at this point in the history
wget is missing from some system (like macOS and Windows native),
it's better to use curl to simplify build environment.

Signed-off-by: Huang Qi <[email protected]>
  • Loading branch information
no1wudi authored and xiaoxiang781216 committed Dec 22, 2020
1 parent c694719 commit 073912e
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 15 deletions.
10 changes: 5 additions & 5 deletions Documentation/quickstart/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ ARM architecture:
$ HOST_PLATFORM=x86_64-linux # use "mac" for macOS.
$ # For windows there is a zip instead (gcc-arm-none-eabi-9-2019-q4-major-win32.zip)
$ wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-${HOST_PLATFORM}.tar.bz2
$ curl -L -O https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-${HOST_PLATFORM}.tar.bz2
$ tar xf gcc-arm-none-eabi-9-2019-q4-major-${HOST_PLATFORM}.tar.bz2
Add the toolchain to your `PATH`:
Expand Down Expand Up @@ -162,8 +162,8 @@ Apache NuttX is actively developed on GitHub. There are two main repositories, `
$ mkdir nuttx
$ cd nuttx
$ wget https://github.com/apache/incubator-nuttx/tarball/master -O nuttx.tar.gz
$ wget https://github.com/apache/incubator-nuttx-apps/tarball/master -O apps.tar.gz
$ curl -L https://github.com/apache/incubator-nuttx/tarball/master -o nuttx.tar.gz
$ curl -L https://github.com/apache/incubator-nuttx-apps/tarball/master -o apps.tar.gz
$ tar zxf nuttx.tar.gz
$ tar zxf apps.tar.gz
Expand All @@ -179,7 +179,7 @@ Apache NuttX is actively developed on GitHub. There are two main repositories, `
$ mkdir nuttx
$ cd nuttx
$ wget https://downloads.apache.org/incubator/nuttx/9.1.0/apache-nuttx-9.1.0-incubating.tar.gz -O nuttx.tar.gz
$ wget https://downloads.apache.org/incubator/nuttx/9.1.0/apache-nuttx-apps-9.1.0-incubating.tar.gz -O apps.tar.gz
$ curl -L https://downloads.apache.org/incubator/nuttx/9.1.0/apache-nuttx-9.1.0-incubating.tar.gz -o nuttx.tar.gz
$ curl -L https://downloads.apache.org/incubator/nuttx/9.1.0/apache-nuttx-apps-9.1.0-incubating.tar.gz -o apps.tar.gz
$ tar zxf nuttx.tar.gz
$ tar zxf apps.tar.gz
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ Cygwin configuration:
gcc-core byacc libmpfr-dev
gcc-g++ gperf libmpc-dev
flex gdb automake-1.15
libncurses-dev libgmp-dev
libncurses-dev libgmp-dev curl

After installing Cygwin, you will get lots of links for installed
tools and shells. I use the RXVT native shell. It is fast and reliable
Expand Down Expand Up @@ -319,6 +319,7 @@ README.txt file in the tools repository. This requires the following
additional tools:

pacman -S bison
pacman -S curl
pacman -S gperf
pacman -S ncurses-devel
pacman -S automake-wrapper
Expand Down
2 changes: 1 addition & 1 deletion arch/xtensa/src/esp32/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ WIRELESS_DRV_URL = https://github.com/espressif/esp-wireless-drivers-3rdpart

$(WIRELESS_DRV_ZIP):
$(Q) echo "Downloading: ESP Wireless Drivers"
$(Q) wget $(WIRELESS_DRV_URL)/$(WIRELESS_DRV_ZIP) -P chip/
$(Q) curl -L $(WIRELESS_DRV_URL)/$(WIRELESS_DRV_ZIP) -o chip/$(WIRELESS_DRV_ZIP)

chip/$(WIRELESS_DRV_UNPACK): $(WIRELESS_DRV_ZIP)
$(Q) echo "Unpacking: ESP Wireless Drivers"
Expand Down
2 changes: 1 addition & 1 deletion fs/littlefs/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ LITTLEFS_VERSION ?= 2.2.1
LITTLEFS_TARBALL = v$(LITTLEFS_VERSION).tar.gz

$(LITTLEFS_TARBALL):
$(Q) wget -P littlefs https://github.com/ARMmbed/littlefs/archive/$(LITTLEFS_TARBALL)
$(Q) curl -L -o littlefs/$(LITTLEFS_TARBALL) https://github.com/ARMmbed/littlefs/archive/$(LITTLEFS_TARBALL)

.littlefsunpack: $(LITTLEFS_TARBALL)
$(Q) tar zxf littlefs/$(LITTLEFS_TARBALL) -C littlefs
Expand Down
2 changes: 1 addition & 1 deletion libs/libc/audio/libsrc/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ PACKAGE=libsamplerate
VERSION=0.1.9

libsamplerate:
$(Q) wget https://codeload.github.com/libsndfile/libsamplerate/zip/master -O libsamplerate.zip
$(Q) curl -L https://codeload.github.com/libsndfile/libsamplerate/zip/master -o libsamplerate.zip
$(Q) unzip -o libsamplerate.zip
$(Q) mv libsamplerate-master libsamplerate
$(Q) cp -rf libsamplerate/src/samplerate.h $(TOPDIR)$(DELIM)include$(DELIM)nuttx$(DELIM)audio$(DELIM)
Expand Down
4 changes: 2 additions & 2 deletions libs/libc/zoneinfo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ tzbin:
mkdir tzbin

tzcode-latest.tar.gz:
$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzcode-latest.tar.gz
$(Q) curl -L -O ftp://ftp.iana.org/tz/tzcode-latest.tar.gz

tzdata-latest.tar.gz:
$(Q) wget --retr-symlinks ftp://ftp.iana.org/tz/tzdata-latest.tar.gz
$(Q) curl -L -O ftp://ftp.iana.org/tz/tzdata-latest.tar.gz

.tzunpack: tzcode tzcode-latest.tar.gz tzdata-latest.tar.gz
$(Q) tar zx -C tzcode -f tzcode-latest.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion libs/libxx/libcxx.defs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
VERSION=11.0.0

libcxx-$(VERSION).src.tar.xz:
$(Q) wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$(VERSION)/libcxx-$(VERSION).src.tar.xz
$(Q) curl -O -L https://github.com/llvm/llvm-project/releases/download/llvmorg-$(VERSION)/libcxx-$(VERSION).src.tar.xz

libcxx: libcxx-$(VERSION).src.tar.xz
$(Q) tar -xf libcxx-$(VERSION).src.tar.xz
Expand Down
2 changes: 1 addition & 1 deletion libs/libxx/uClibc++.defs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
VERSION=0.2.5

$(TOPDIR)/include/uClibc++:
$(Q) wget https://git.busybox.net/uClibc++/snapshot/uClibc++-$(VERSION).tar.gz
$(Q) curl -O -L https://git.busybox.net/uClibc++/snapshot/uClibc++-$(VERSION).tar.gz
$(Q) tar -xzf uClibc++-$(VERSION).tar.gz
$(Q) $(DELFILE) uClibc++-$(VERSION).tar.gz
$(Q) mv uClibc++-$(VERSION) uClibc++
Expand Down
2 changes: 1 addition & 1 deletion openamp/libmetal.defs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ LIBMETAL_HDRS_SEDEXP := \
s/cmakedefine/undef/g"

libmetal.zip:
$(Q) wget https://github.com/OpenAMP/libmetal/archive/v$(VERSION).zip -O libmetal.zip
$(Q) curl -L https://github.com/OpenAMP/libmetal/archive/v$(VERSION).zip -o libmetal.zip
$(Q) unzip -o libmetal.zip
$(Q) mv libmetal-$(VERSION) libmetal
$(Q) patch -p0 < 0001-system-nuttx-change-clock_systimespec-to-clock_systi.patch
Expand Down
2 changes: 1 addition & 1 deletion openamp/open-amp.defs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CSRCS += open-amp/lib/virtio/virtio.c
CSRCS += open-amp/lib/virtio/virtqueue.c

open-amp.zip:
$(Q) wget https://github.com/OpenAMP/open-amp/archive/v$(VERSION).zip -O open-amp.zip
$(Q) curl -L https://github.com/OpenAMP/open-amp/archive/v$(VERSION).zip -o open-amp.zip
$(Q) unzip -o open-amp.zip
$(Q) mv open-amp-$(VERSION) open-amp
$(Q) patch -p0 < 0001-rpmsg-remove-the-address-check-in-rpmsg_send-rpmsg_t.patch
Expand Down

0 comments on commit 073912e

Please sign in to comment.