git.annexia.org / fedora-riscv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add bzip2 to the stage3 chroot.
[fedora-riscv.git] / Makefile
diff --git a/Makefile b/Makefile
index 228d045..d69846e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,8 @@ LOCAL_LINUX_GIT_COPY = $(HOME)/d/linux
 # The root packages (plus their dependencies) that we want to
 # cross-compile into the stage 3 chroot.
 # beecrypt-devel is required to build RPM.
-STAGE3_PACKAGES = gcc rpm-build beecrypt-devel
+# Packages for usability: nano, grep, less
+STAGE3_PACKAGES = gcc rpm-build beecrypt-devel nano grep less
 
 # Versions of cross-compiled packages.
 NCURSES_VERSION    = 6.0-20160730
@@ -60,6 +61,12 @@ BEECRYPT_VERSION   = 4.2.1
 RPM_COMMIT         = 95712183458748ea6cafebac1bdd5daa097d9bee
 RPM_SHORT_COMMIT   = 9571218
 BDB_VERSION        = 4.5.20
+NANO_VERSION       = 2.6.2
+GREP_VERSION       = 2.25
+LESS_VERSION       = 481
+STRACE_COMMIT      = f320e1897832fd07a62e18ed288e75d8e79f4c5b
+STRACE_SHORT_COMMIT = f320e189
+BZIP2_VERSION      = 1.0.6
 
 all: stage1 stage2 stage3 stage4
 
@@ -275,6 +282,11 @@ stage3: stage3-kernel/linux-$(KERNEL_VERSION)/vmlinux \
        stage3-chroot/usr/lib64/libpopt.so \
        stage3-chroot/usr/lib64/libbeecrypt.so \
        stage3-chroot/usr/bin/rpm \
+       stage3-chroot/usr/bin/nano \
+       stage3-chroot/usr/bin/grep \
+       stage3-chroot/usr/bin/less \
+       stage3-chroot/usr/bin/strace \
+       stage3-chroot/usr/bin/bzip2 \
        stage3-chroot/init \
        stage3-disk.img
 
@@ -639,7 +651,10 @@ stage3-chroot/usr/bin/rpm: rpm-$(RPM_SHORT_COMMIT).tar.gz db-$(BDB_VERSION).tar.
        tar -zxf rpm-$(RPM_SHORT_COMMIT).tar.gz
        tar -zxf db-$(BDB_VERSION).tar.gz -C rpm-$(RPM_SHORT_COMMIT)
        cd rpm-$(RPM_SHORT_COMMIT) && ln -s db-$(BDB_VERSION) db
-       cd rpm-$(RPM_SHORT_COMMIT) && patch -p1 < ../rpm-hacks.patch
+       cd rpm-$(RPM_SHORT_COMMIT) && \
+       patch -p1 < ../0001-RISCV-64-bit-riscv64-support.patch && \
+       patch -p1 < ../0002-build-fgetc-returns-int-not-char.patch && \
+       patch -p1 < ../0003-HACKS-TO-GET-RPM-TO-CROSS-COMPILE.patch
        cd rpm-$(RPM_SHORT_COMMIT) && autoreconf -i
        cd rpm-$(RPM_SHORT_COMMIT) && \
        PATH=$(ROOT)/fixed-gcc:$$PATH \
@@ -655,8 +670,6 @@ stage3-chroot/usr/bin/rpm: rpm-$(RPM_SHORT_COMMIT).tar.gz db-$(BDB_VERSION).tar.
            --without-external-db \
            --enable-ndb \
            --disable-plugins
-       cd rpm-$(RPM_SHORT_COMMIT) && \
-       sed -i 's|^sys_lib_dlsearch_path_spec="/lib64|sys_lib_dlsearch_path_spec="$(ROOT)/stage3-chroot/usr/lib64 /lib64|g' libtool
        cd rpm-$(RPM_SHORT_COMMIT) && PATH=$(ROOT)/fixed-gcc:$$PATH make V=1
        cd rpm-$(RPM_SHORT_COMMIT) && PATH=$(ROOT)/fixed-gcc:$$PATH make install DESTDIR=$(ROOT)/stage3-chroot
        rm -f stage3-chroot/usr/lib64/*.la
@@ -671,6 +684,98 @@ db-$(BDB_VERSION).tar.gz:
        wget -O $@-t http://download.oracle.com/berkeley-db/db-$(BDB_VERSION).tar.gz
        mv $@-t $@
 
+# Cross-compile GNU nano (editor).
+stage3-chroot/usr/bin/nano: nano-$(NANO_VERSION).tar.gz
+       rm -rf nano-$(NANO_VERSION)
+       tar -zxf $^
+       cd nano-$(NANO_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       LDFLAGS=-L$(ROOT)/stage3-chroot/usr/lib64 \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd nano-$(NANO_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd nano-$(NANO_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+nano-$(NANO_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t https://www.nano-editor.org/dist/v2.6/nano-$(NANO_VERSION).tar.gz
+       mv $@-t $@
+
+# Cross-compile GNU grep.
+stage3-chroot/usr/bin/grep: grep-$(GREP_VERSION).tar.xz
+       rm -rf grep-$(GREP_VERSION)
+       tar -Jxf $^
+       cd grep-$(GREP_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd grep-$(GREP_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd grep-$(GREP_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+grep-$(GREP_VERSION).tar.xz:
+       rm -f $@ $@-t
+       wget -O $@-t https://ftp.gnu.org/gnu/grep/grep-$(GREP_VERSION).tar.xz
+       mv $@-t $@
+
+# Cross-compile less.
+stage3-chroot/usr/bin/less: less-$(LESS_VERSION).tar.gz
+       rm -rf less-$(LESS_VERSION)
+       tar -zxf $^
+       cd less-$(LESS_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       LDFLAGS=-L$(ROOT)/stage3-chroot/usr/lib64 \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd less-$(LESS_VERSION) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd less-$(LESS_VERSION) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+less-$(LESS_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t http://www.greenwoodsoftware.com/less/less-$(LESS_VERSION).tar.gz
+       mv $@-t $@
+
+# Cross-compile strace.
+# XXX This does not work.
+stage3-chroot/usr/bin/strace: strace-$(STRACE_SHORT_COMMIT).tar.gz
+       rm -rf strace-$(STRACE_SHORT_COMMIT)
+       tar -zxf $^
+       cd riscv-strace-$(STRACE_COMMIT) && patch -p1 < ../0001-Update-riscv_regs-for-ptrace.h-from-Linux-4.1.x.patch
+       cd riscv-strace-$(STRACE_COMMIT) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       LDFLAGS=-L$(ROOT)/stage3-chroot/usr/lib64 \
+       ./configure \
+           --host=riscv64-unknown-linux-gnu \
+           --prefix=/usr --libdir=/usr/lib64
+       cd riscv-strace-$(STRACE_COMMIT) && PATH=$(ROOT)/fixed-gcc:$$PATH make
+       cd riscv-strace-$(STRACE_COMMIT) && make install DESTDIR=$(ROOT)/stage3-chroot
+
+strace-$(STRACE_SHORT_COMMIT).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t 'https://github.com/riscv/riscv-strace/archive/$(STRACE_COMMIT)/riscv-strace-$(STRACE_SHORTCOMMIT).tar.gz'
+       mv $@-t $@
+
+# Cross-compile bzip2.
+stage3-chroot/usr/bin/bzip2: bzip2-$(BZIP2_VERSION).tar.gz
+       rm -rf bzip2-$(BZIP2_VERSION)
+       tar -zxf $^
+       cd bzip2-$(BZIP2_VERSION) && \
+       PATH=$(ROOT)/fixed-gcc:$$PATH \
+       make libbz2.a bzip2 bzip2recover \
+       PREFIX=/usr \
+       CC=riscv64-unknown-linux-gnu-gcc \
+       AR=riscv64-unknown-linux-gnu-ar \
+       RANLIB=riscv64-unknown-linux-gnu-ranlib
+       cd bzip2-$(BZIP2_VERSION) && \
+       make install PREFIX=$(ROOT)/stage3-chroot/usr
+
+bzip2-$(BZIP2_VERSION).tar.gz:
+       rm -f $@ $@-t
+       wget -O $@-t http://www.bzip.org/1.0.6/bzip2-$(BZIP2_VERSION).tar.gz
+       mv $@-t $@
+
 # Create an /init script.
 stage3-chroot/init: init.sh
        install -m 0755 $^ $@
Fedora RISC-V bootstrapping