diff options
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | TODO | 8 | ||||
| -rw-r--r-- | local.conf | 3 | ||||
| -rw-r--r-- | recipe.d/0006-texinfo | 4 | ||||
| -rw-r--r-- | recipe.d/0007-gdb | 6 | ||||
| -rw-r--r-- | recipe.d/0010-pcre | 3 | ||||
| -rw-r--r-- | recipe.d/0012-chkconfig | 12 | ||||
| -rwxr-xr-x | stage1 | 67 | ||||
| -rwxr-xr-x | stage2 | 2 |
9 files changed, 100 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8cb90f --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +.*.swp +.ccache +bld.log +builds +distccd.log +distccd.script +done +f17-local +f17-sources +install +rootfs +rpmbuild +SRPMlocal +SRPMs @@ -0,0 +1,8 @@ + +-- During stage1, found it necessary to add -rpath ${ROOTFS}/lib to several + of the build steps; is this a libtool bug or what? And does it matter? + +-- When the stage1 script builds distccd.script, it picks up 127.0.0.1 + as my hostname IP address. While technically correct, it's not very + useful. Granted my network setup is a little odd out of necessity, + is there some way to accomodate this better? diff --git a/local.conf b/local.conf new file mode 100644 index 0000000..9493a88 --- /dev/null +++ b/local.conf @@ -0,0 +1,3 @@ + +PATH=$PATH:$HOME/fedora/armv8/f17/bootstrap + diff --git a/recipe.d/0006-texinfo b/recipe.d/0006-texinfo index 677c80b..ac911bc 100644 --- a/recipe.d/0006-texinfo +++ b/recipe.d/0006-texinfo @@ -2,6 +2,10 @@ mcd $BUILDDIR/texinfo $SRC/texinfo-*/configure $TCONFIGARGS + # texi2dvi has been touched so the builder + # will try to rebuild the man page from texi2dvi but that + # spits out only a warning that no tex system is installed + touch doc/texi2dvi.1 make $J -k make $J -k install diff --git a/recipe.d/0007-gdb b/recipe.d/0007-gdb index cdaf9bf..5e9671b 100644 --- a/recipe.d/0007-gdb +++ b/recipe.d/0007-gdb @@ -5,7 +5,11 @@ #requires texinfo mcd $BUILDDIR/gdb - $SRC/gdb-*/configure $TCONFIGARGS --without-rpm --with-system-readline + OTHERARGS="--disable-gdbserver --disable-multi-ice \ + --without-expat --without-python --without-tcl \ + --without-tk --without-x --disable-gtk \ + --without-rpm --with-system-readline" + $SRC/gdb-*/configure $TCONFIGARGS $OTHERARGS notparallel make $J -k make $J -k install diff --git a/recipe.d/0010-pcre b/recipe.d/0010-pcre index 9f3b6bf..2a3ff4b 100644 --- a/recipe.d/0010-pcre +++ b/recipe.d/0010-pcre @@ -6,5 +6,6 @@ rm -f /usr/share/man/man3/pcre* || true mcd $BUILDDIR/pcre $SRC/pcre-*/configure $TCONFIGARGS make $J - make $J install + #make $J install + make $J install-exec install-includeHEADERS install-nodist_includeHEADERS install-pkgconfigDATA diff --git a/recipe.d/0012-chkconfig b/recipe.d/0012-chkconfig index 4a5686e..c35a3d3 100644 --- a/recipe.d/0012-chkconfig +++ b/recipe.d/0012-chkconfig @@ -1,6 +1,8 @@ -mcd $BUILDDIR/chkconfig -cp -rp $SRC/chkconfig-*/* . -sed '/install.*ntsysv/d; /all/s/ntsysv//' Makefile > Makefile.stage2 -make -f Makefile.stage2 $J CC=gcc -make -f Makefile.stage2 $J -k install || true +#requires popt + + mcd $BUILDDIR/chkconfig + cp -rp $SRC/chkconfig-*/* . + sed '/install.*ntsysv/d; /all/s/ntsysv//' Makefile > Makefile.stage2 + make -f Makefile.stage2 $J CC=gcc + make -f Makefile.stage2 $J -k install || true @@ -374,6 +374,7 @@ case "$1" in go make go sed go coreutils + go busybox go util-linux go tar # only run this far, for now @@ -392,6 +393,8 @@ case "$1" in go ccache go stage2 +# only run this far, for now + exit 0 go stage3 ;; @@ -582,13 +585,14 @@ fi "usrlinks" ) test -d $ROOTFS || mkdir -p $ROOTFS - mkdir $ROOTFS/usr - for i in bin sbin lib - do - ln -s usr/$i $ROOTFS/$i - mkdir $ROOTFS/usr/$i - done - for i in etc + #mkdir $ROOTFS/usr + #for i in bin sbin lib libexec + #do + # ln -s usr/$i $ROOTFS/$i + # mkdir $ROOTFS/usr/$i + #done + #for i in etc proc sys + for i in proc sys do mkdir $ROOTFS/$i done @@ -809,7 +813,7 @@ EOF ln -s gcc ${ROOTFS}/usr/bin/cc ;; - make | tar | gzip | diffutils | findutils | gawk | which | grep ) + make | tar | gzip | diffutils | gawk | which | grep ) srpm $1 mcd $BUILDDIR/$1 $SRC/${1}-*/configure $TCONFIGARGS @@ -819,6 +823,16 @@ EOF make $J install DESTDIR=${ROOTFS} ;; + findutils ) + srpm $1 + mcd $BUILDDIR/$1 + FINDLIBS="-lselinux -ldl" $SRC/${1}-*/configure $TCONFIGARGS + notparallel + test -d tools/gnulib/lib && make $J V=1 -C tools/gnulib/lib + make $J V=1 + make $J install DESTDIR=${ROOTFS} + ;; + sed ) srpm $1 mcd $BUILDDIR/$1 @@ -893,6 +907,33 @@ EOF make $J install DESTDIR=${ROOTFS} ;; + busybox ) + srpm busybox + mcd $BUILDDIR/$1 + rsync -av $SRC/busybox-*/ ./ + notparallel + make TEST_aarch64_f17_defconfig CROSS_COMPILE=${TARGET}- + make busybox CROSS_COMPILE=${TARGET}- + make install CONFIG_PREFIX=${ROOTFS} + + # add in some basic mount points + [ -d ${ROOTFS}/proc ] || mkdir ${ROOTFS}/proc + [ -d ${ROOTFS}/sys ] || mkdir ${ROOTFS}/sys + ( + echo "proc /proc proc defaults 0 0" + echo "sysfs /sys sysfs defaults 0 0" + ) > $ROOTFS/etc/fstab + + # and a place holder for other useful initializations + [ -d ${ROOTFS}/etc/init.d ] || mkdir -p ${ROOTFS}/etc/init.d + echo "#!/bin/sh" > ${ROOTFS}/etc/init.d/rcS + ( + echo "#!/bin/sh" + echo "/bin/mount -a" + ) > $ROOTFS/etc/init.d/rcS + chmod +x ${ROOTFS}/etc/init.d/rcS + ;; + util-linux ) srpm util-linux mcd $BUILDDIR/$1 @@ -900,7 +941,9 @@ EOF ax_cv_have_tls=yes scanf_cv_alloc_modifier=yes EOF - $SRC/${1}-*/configure $TCONFIGARGS --without-ncurses --disable-wall --cache-file=config.cache + $SRC/${1}-*/configure $TCONFIGARGS --without-ncurses \ + --prefix=/usr --libexecdir=/usr/lib --libdir=/usr/lib \ + --disable-wall --cache-file=config.cache notparallel make $J V=1 make $J install DESTDIR=${ROOTFS} @@ -935,7 +978,7 @@ EOF distcc ) srpm distcc mcd $BUILDDIR/distcc - $SRC/${1}-*/configure $TCONFIGARGS --disable-Werror + $SRC/${1}-*/configure $TCONFIGARGS --disable-Werror --without-avahi notparallel make $J V=1 make $J install DESTDIR=${ROOTFS} @@ -1028,7 +1071,9 @@ EOF | sed 's/--host=[^ ]*//' \ | sed 's/--target=[^ ]*//' \ | sed 's/--with-sysroot=[^ ]*//' \ - | sed 's/--with-build-sysroot=[^ ]*//' + | sed 's/--with-build-sysroot=[^ ]*//' \ + | sed 's/--with-arch=armv8//' \ + | sed 's/--with-fpu=neon-fp-armv8//' echo export J DISTCC_HOSTS DISTCC_BACKOFF_PERIOD PATH echo export TARGET RPMTARGET TCONFIGARGS @@ -64,7 +64,7 @@ J=-j2 BUILDDIR=$TOP/builds # The cross-compiler target -TARGET=armv7hl-redhat-linux-gnueabi +TARGET=aarch64-redhat-linux-gnu export TARGET BUILDDIR J SRC STAGE2 MYDIR TOP |