From 8d9c1e99b7357ce16d8c7283bb74d4fd898ccdc8 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Mon, 8 Oct 2012 16:52:53 -0600 Subject: corrections to stage1 up to and including 'go make' --- stage1 | 72 ++++++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/stage1 b/stage1 index d20efc4..419cda2 100755 --- a/stage1 +++ b/stage1 @@ -41,8 +41,8 @@ DISTCC_PORT=3639 BUILDDIR=$TOP/builds PREFIX=$TOP/install -KCONFIGDIR=$BUILDDIR/kernel/configs -KCONFIG=kernel-3.*-armv7hl-tegra.config +KCONFIGDIR=$BUILDDIR/kernel +KCONFIG=kernel-3.*-arm64.config # used by kernel and glibc KARCH=arm64 KIMAGE=uImage @@ -52,17 +52,18 @@ NEED_UBOOT=no # The cross-compiler target TARGET=aarch64-redhat-linux-gnu # the RPMBUILD target for prepping sources -#RPMTARGET=aarch64-redhat-linux-gnu -RPMTARGET=arm64-redhat-linux-gnu +RPMTARGET=aarch64-redhat-linux-gnu +# due to naming politics, the kernel may or may not have a different target +KERNEL_RPMTARGET=arm64-redhat-linux-gnu # this is where the new rootfs will be built ROOTFS=$TOP/rootfs -#CONFIG_EXTRA="--with-arch=armv8 -# --with-fpu=neon-fp-armv8 -#" +CONFIG_EXTRA="--with-arch=armv8 + --with-fpu=neon-fp-armv8 +" -CONFIG_EXTRA="--with-arch=armv8-a +GCC_CONFIG_EXTRA="--with-arch=armv8-a " if [ -f $MYDIR/local.conf ] @@ -137,6 +138,7 @@ mcd() srpm() { STOP=${2-$TOP} + STARGET=${3-$RPMTARGET} SDIR=$SRPMDIR_LOCAL SRPM=$(cd $SDIR; \ls -1 $1-*.src.rpm 2>/dev/null | egrep -v $1'-.*-.*-' | tail -1) if [ -f $SDIR/$SRPM ] @@ -153,7 +155,7 @@ srpm() test -f $SDIR/$SRPM || exit 1 HOME=$STOP rpm -i $SDIR/$SRPM cd $STOP/rpmbuild/SPECS - HOME=$STOP rpmbuild --target=$RPMTARGET --nodeps -bp $SPEC.spec + HOME=$STOP rpmbuild --target=$STARGET --nodeps -bp $SPEC.spec cd $TOP fi } @@ -166,7 +168,7 @@ set -e BUILD=`gcc -v 2>&1 | grep Target: | sed 's/.*: //'` -# These are for cross-tools like gcc, binutils +# These are for cross-tools like binutils CONFIGARGS="--prefix=$PREFIX --target=$TARGET ${CONFIG_EXTRA} @@ -190,6 +192,31 @@ TCONFIGARGS="--prefix=/usr --enable-threads=posix " +# These are for gcc cross-tools (politics sometime result in slightly +# different arch names) +GCC_CONFIGARGS="--prefix=$PREFIX + --target=$TARGET + ${GCC_CONFIG_EXTRA} + --enable-languages=c,c++ + --with-sysroot=$ROOTFS + --enable-threads=posix + --enable-64-bit-bfd + $WITHPPL +" + +GCC_TCONFIGARGS="--prefix=/usr + --with-sysroot=/ + --with-build-sysroot=$ROOTFS + --build=$BUILD + --host=$TARGET + --target=$TARGET + --enable-werror=no + --enable-cxx + ${GCC_CONFIG_EXTRA} + --enable-languages=c,c++ + --enable-threads=posix +" + KERNELARGS="ARCH=${KARCH} CROSS_COMPILE=${TARGET}-" @@ -325,12 +352,10 @@ case "$1" in go glibc-headers go gcc-libgcc go glibc -# only run this far, for now - exit 0 go gcc go dev -# go kernel +# go kernel test x"$NEED_XLOADER" == x"yes" && go x-loader test x"$NEED_UBOOT" == x"yes" && go u-boot @@ -347,6 +372,8 @@ case "$1" in go t-gcc go bash go make +# only run this far, for now + exit 0 go sed go coreutils go util-linux @@ -396,7 +423,7 @@ case "$1" in # host cross-tools "kernel-headers" ) - srpm kernel + srpm kernel $TOP $KERNEL_RPMTARGET mcd $BUILDDIR/kernel cd $SRC/kernel-*/linux-* make $KERNELARGS INSTALL_HDR_PATH=$ROOTFS/usr headers_install @@ -415,7 +442,7 @@ case "$1" in srpm gcc mcd $BUILDDIR/gcc prefill_gcc_cache - $SRC/gcc-*/configure $CONFIGARGS --with-headers=$ROOTFS/usr/include --cache-file=config.cache + $SRC/gcc-*/configure $GCC_CONFIGARGS --with-headers=$ROOTFS/usr/include --cache-file=config.cache notparallel make $J all-host make $J install-host @@ -498,7 +525,7 @@ fi srpm gcc mcd $BUILDDIR/gcc prefill_gcc_cache - $SRC/gcc-*/configure $CONFIGARGS --with-headers=$ROOTFS/usr/include --cache-file=config.cache + $SRC/gcc-*/configure $GCC_CONFIGARGS --with-headers=$ROOTFS/usr/include --cache-file=config.cache notparallel make $J all-target-libgcc all-target-libssp make $J install-target-libgcc install-target-libssp @@ -541,7 +568,7 @@ fi srpm gcc mcd $BUILDDIR/gcc prefill_gcc_cache - $SRC/gcc-*/configure $CONFIGARGS --with-headers=$ROOTFS/usr/include --cache-file=config.cache + $SRC/gcc-*/configure $GCC_CONFIGARGS --with-headers=$ROOTFS/usr/include --cache-file=config.cache notparallel make $J make $J install @@ -601,13 +628,14 @@ fi ;; "kernel" ) - srpm kernel + srpm kernel $TOP $KERNEL_RPMTARGET mcd $BUILDDIR/kernel echo copying kernel sources to build area... rsync -a --delete $SRC/kernel-*/linux-*/ ./ cp $KCONFIGDIR/$KCONFIG .config make $J ARCH=$KARCH CROSS_COMPILE=${TARGET}- silentoldconfig - make $J ARCH=$KARCH CROSS_COMPILE=${TARGET}- $KIMAGE + #make $J ARCH=$KARCH CROSS_COMPILE=${TARGET}- $KIMAGE + make $J ARCH=$KARCH CROSS_COMPILE=${TARGET}- make $J ARCH=$KARCH CROSS_COMPILE=${TARGET}- modules make $J ARCH=$KARCH CROSS_COMPILE=${TARGET}- INSTALL_MOD_PATH=$ROOTFS modules_install @@ -692,7 +720,7 @@ fi srpm cloog mcd $BUILDDIR/t-cloog $SRC/cloog-*/configure $TCONFIGARGS --with-ppl - make $J + make $J LDADD="-rpath ${ROOTFS}/lib -lcloog" make $J install DESTDIR=${ROOTFS} fix_la cloog ;; @@ -733,7 +761,7 @@ fi RANLIB=${TARGET}-ranlib \ CFLAGS="" \ TLSFLAGS="" \ - all + all LDFLAGS="-Wl,-rpath -Wl,${ROOTFS}/lib" make $J \ DESTDIR=${ROOTFS} \ install @@ -773,7 +801,7 @@ EOF "t-gcc" ) srpm gcc mcd $BUILDDIR/t-gcc - $SRC/gcc-*/configure $TCONFIGARGS --enable-linker-build-id + $SRC/gcc-*/configure $GCC_TCONFIGARGS --enable-linker-build-id notparallel make $J make $J install DESTDIR=${ROOTFS} -- cgit From 0e989bc0c1de7918e958162df4ac38a4b24299cb Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 10 Oct 2012 15:38:53 -0600 Subject: final corrections for aarch64 stage1 --- stage1 | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/stage1 b/stage1 index 419cda2..71b98b1 100755 --- a/stage1 +++ b/stage1 @@ -372,8 +372,6 @@ case "$1" in go t-gcc go bash go make -# only run this far, for now - exit 0 go sed go coreutils go util-linux @@ -390,6 +388,8 @@ case "$1" in go grep go distcc go ccache +# only run this far, for now + exit 0 go stage2 go stage3 @@ -809,7 +809,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 +819,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 @@ -829,7 +839,7 @@ EOF # built sed binary in order to extract the --help output, but # this fails because the sed binary is a cross-tool. touch doc/sed.1 - make $J V=1 + make $J V=1 CFLAGS="-lselinux -Wl,-rpath -Wl,${ROOTFS}/lib" make $J install DESTDIR=${ROOTFS} ;; @@ -889,7 +899,7 @@ EOF base=`echo $i | sed 's/\.x//'` touch man/$base.1 done - make $J V=1 + make $J V=1 CFLAGS="-lselinux -Wl,-rpath -Wl,${ROOTFS}/lib" make $J install DESTDIR=${ROOTFS} ;; @@ -935,7 +945,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} -- cgit From 892a41d090fb5d47862c53939caa1d84be1e591b Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 10 Oct 2012 17:38:59 -0600 Subject: merging and updating branch a bit --- TODO | 17 +++++++++++++++++ local.conf | 4 ++++ 2 files changed, 21 insertions(+) create mode 100644 TODO create mode 100644 local.conf diff --git a/TODO b/TODO new file mode 100644 index 0000000..51c7774 --- /dev/null +++ b/TODO @@ -0,0 +1,17 @@ + +-- During stage1, found it necessary to remove the line: + + +_libc_intl_domainname D 0x5 + + from the patch for the glibc source file: + + glibc-ports/sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist + + This is Not A Good Thing. It needs to go back, and we need to understand + why the final link for glibc fails in stage1 when that line is present in + that file; the failure is reported by ld as a relocation it cannot figure + out. + +-- 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? + diff --git a/local.conf b/local.conf new file mode 100644 index 0000000..da5e74e --- /dev/null +++ b/local.conf @@ -0,0 +1,4 @@ + +#PATH=$PATH:$HOME/projects/armv8/aarch64-toolchain/linux-toolchain/opt/aarch64/bin +PATH=$PATH:$HOME/projects/bootstrap/install/bin + -- cgit From c50e34d4baa68e789aceda7f03c7e94e339cda98 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 10 Oct 2012 17:40:56 -0600 Subject: add ignore, go to end of stage1 --- .gitignore | 10 ++++++++++ stage1 | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f04ca0b --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +bld.log +builds +done +f17-local +f17-sources +install +rootfs +rpmbuild +SRPMlocal +SRPMs diff --git a/stage1 b/stage1 index 7c6c32a..71b98b1 100755 --- a/stage1 +++ b/stage1 @@ -364,8 +364,6 @@ case "$1" in go mpc go ppl go cloog -# only run this far, for now - exit 0 go libsepol go libselinux go zlib -- cgit From 7e728c77fef82055ee91fcad6957e1780c519b3a Mon Sep 17 00:00:00 2001 From: Al Stone Date: Tue, 16 Oct 2012 16:13:08 -0600 Subject: corrected ln path for utils-linux --- stage1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/stage1 b/stage1 index 71b98b1..e4221a8 100755 --- a/stage1 +++ b/stage1 @@ -388,10 +388,10 @@ case "$1" in go grep go distcc go ccache -# only run this far, for now - exit 0 go stage2 +# only run this far, for now + exit 0 go stage3 ;; @@ -910,7 +910,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} -- cgit From 5eefff0076c8f360add88dd33267700d31c98e4f Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 17 Oct 2012 16:54:05 -0600 Subject: added libexec to usrlinks so compilers would work --- stage1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage1 b/stage1 index e4221a8..d3b02a4 100755 --- a/stage1 +++ b/stage1 @@ -583,7 +583,7 @@ fi "usrlinks" ) test -d $ROOTFS || mkdir -p $ROOTFS mkdir $ROOTFS/usr - for i in bin sbin lib + for i in bin sbin lib libexec do ln -s usr/$i $ROOTFS/$i mkdir $ROOTFS/usr/$i -- cgit From 4e437bd0236fc6accd6eaa5a77f436225601af1f Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 17 Oct 2012 16:54:59 -0600 Subject: set proper target in stage2 --- stage2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage2 b/stage2 index c6afed2..a279421 100755 --- a/stage2 +++ b/stage2 @@ -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 -- cgit From 11b491610cc4fcbf8e252c6ec5d72ae3ad0500bc Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 25 Oct 2012 10:40:18 -0600 Subject: update gdb config parameters in stage2 --- recipe.d/0007-gdb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit From 82db456cb1fab98ce03401f450a2eed7f5b54b1f Mon Sep 17 00:00:00 2001 From: Al Stone Date: Tue, 30 Oct 2012 15:28:06 +0100 Subject: add temporary use of sysvinit --- stage1 | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/stage1 b/stage1 index d3b02a4..2b5a392 100755 --- a/stage1 +++ b/stage1 @@ -374,6 +374,7 @@ case "$1" in go make go sed go coreutils + go sysvinit go util-linux go tar go gzip @@ -903,6 +904,25 @@ EOF make $J install DESTDIR=${ROOTFS} ;; + sysvinit ) + srpm sysvinit + mcd $BUILDDIR/$1 + notparallel + rsync -av $SRC/sysvinit-*/ ./ + cp src/init.c.single src/init.c + make \ + CC=${TARGET}-gcc \ + AS=${TARGET}-as \ + AR=${TARGET}-ar \ + STRIP=${TARGET}-strip \ + RANLIB=${TARGET}-ranlib \ + CFLAGS="" \ + LDFLAGS="-ldl" \ + WITH_SELINUX=yes \ + -C src + make install ROOT=${ROOTFS} + ;; + util-linux ) srpm util-linux mcd $BUILDDIR/$1 @@ -1024,10 +1044,12 @@ EOF cp $STAGE2 $ROOTFS/stage2/stage2 ( - newJ=$(echo $J | sed 's/-j//') - echo J=-j$newJ + #newJ=$(echo $J | sed 's/-j//') + #echo J=-j$newJ + echo J=-j1 - echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999 + #echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999 + echo DISTCC_HOSTS=localhost echo DISTCC_BACKOFF_PERIOD=0 echo PATH=/stage2/distcc-bin:\$PATH -- cgit From 836e10f940d5625d2e83eb41accf17f99043c0a6 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 31 Oct 2012 15:27:38 +0100 Subject: minor tweak to texinfo for stage2 --- recipe.d/0006-texinfo | 4 ++++ stage1 | 1 + 2 files changed, 5 insertions(+) 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/stage1 b/stage1 index 2b5a392..4f2edfa 100755 --- a/stage1 +++ b/stage1 @@ -921,6 +921,7 @@ EOF WITH_SELINUX=yes \ -C src make install ROOT=${ROOTFS} + echo 'id:S:initdefault:' > ${ROOTFS}/etc/inittab ;; util-linux ) -- cgit From c22ce88b2ebd51684b88274ade3d6bbf01f85843 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 8 Nov 2012 17:45:42 -0700 Subject: update TODO list --- TODO | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/TODO b/TODO index 51c7774..a971586 100644 --- a/TODO +++ b/TODO @@ -1,17 +1,8 @@ --- During stage1, found it necessary to remove the line: - - +_libc_intl_domainname D 0x5 - - from the patch for the glibc source file: - - glibc-ports/sysdeps/unix/sysv/linux/aarch64/nptl/libc.abilist - - This is Not A Good Thing. It needs to go back, and we need to understand - why the final link for glibc fails in stage1 when that line is present in - that file; the failure is reported by ld as a relocation it cannot figure - out. - -- 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? -- cgit From 88b8131480f6a0a77cc0f00dbeb3b45eceb9a261 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 8 Nov 2012 17:46:57 -0700 Subject: minor cleanup to stage1 script, stage2 step --- stage1 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/stage1 b/stage1 index 4f2edfa..938d96a 100755 --- a/stage1 +++ b/stage1 @@ -921,7 +921,6 @@ EOF WITH_SELINUX=yes \ -C src make install ROOT=${ROOTFS} - echo 'id:S:initdefault:' > ${ROOTFS}/etc/inittab ;; util-linux ) @@ -1045,12 +1044,10 @@ EOF cp $STAGE2 $ROOTFS/stage2/stage2 ( - #newJ=$(echo $J | sed 's/-j//') - #echo J=-j$newJ - echo J=-j1 + newJ=$(echo $J | sed 's/-j//') + echo J=-j$newJ - #echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999 - echo DISTCC_HOSTS=localhost + echo DISTCC_HOSTS=$(host $(hostname) | sed 's/.* //'):${DISTCC_PORT}/999 echo DISTCC_BACKOFF_PERIOD=0 echo PATH=/stage2/distcc-bin:\$PATH @@ -1063,7 +1060,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 -- cgit From 6e72a1a86c433b70bf4a1f52e313dc2dcf696953 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 8 Nov 2012 17:47:43 -0700 Subject: temporary change to not install docs, allowing install to complete --- recipe.d/0010-pcre | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit From a5ebc91ebb9ea78a5d35dd7560f47bbf78258430 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Thu, 8 Nov 2012 17:48:19 -0700 Subject: chkconfig needs gettext and popt to build in stage2 --- recipe.d/0012-chkconfig | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 -- cgit From 1f5b5be717cb8e39e3f33e5566959acc94603be9 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Fri, 9 Nov 2012 12:24:49 -0700 Subject: move bootstrap work to a different location --- local.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/local.conf b/local.conf index da5e74e..9493a88 100644 --- a/local.conf +++ b/local.conf @@ -1,4 +1,3 @@ -#PATH=$PATH:$HOME/projects/armv8/aarch64-toolchain/linux-toolchain/opt/aarch64/bin -PATH=$PATH:$HOME/projects/bootstrap/install/bin +PATH=$PATH:$HOME/fedora/armv8/f17/bootstrap -- cgit From 60e0921254e4aad67db1bec9341e6c24f98ad939 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Fri, 9 Nov 2012 12:25:14 -0700 Subject: ignore a few more files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index f04ca0b..e8cb90f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ +.*.swp +.ccache bld.log builds +distccd.log +distccd.script done f17-local f17-sources -- cgit From 1b93f16ba077c1cfa02b02e7939b3b9a6f9e5554 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Fri, 9 Nov 2012 18:06:43 -0700 Subject: replaced sysvinit with busybox --- stage1 | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/stage1 b/stage1 index 938d96a..6e189a0 100755 --- a/stage1 +++ b/stage1 @@ -374,7 +374,7 @@ case "$1" in go make go sed go coreutils - go sysvinit + go busybox go util-linux go tar go gzip @@ -583,13 +583,14 @@ fi "usrlinks" ) test -d $ROOTFS || mkdir -p $ROOTFS - 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 + #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 @@ -904,23 +905,22 @@ EOF make $J install DESTDIR=${ROOTFS} ;; - sysvinit ) - srpm sysvinit + busybox ) + srpm busybox mcd $BUILDDIR/$1 + rsync -av $SRC/busybox-*/ ./ notparallel - rsync -av $SRC/sysvinit-*/ ./ - cp src/init.c.single src/init.c - make \ - CC=${TARGET}-gcc \ - AS=${TARGET}-as \ - AR=${TARGET}-ar \ - STRIP=${TARGET}-strip \ - RANLIB=${TARGET}-ranlib \ - CFLAGS="" \ - LDFLAGS="-ldl" \ - WITH_SELINUX=yes \ - -C src - make install ROOT=${ROOTFS} + make TEST_aarch64_f17_defconfig CROSS_COMPILE=${TARGET}- + make busybox CROSS_COMPILE=${TARGET}- + make install CONFIG_PREFIX=${ROOTFS} + + # simple start up script to be invoked by hand, if desired + ( + echo '#!/bin/sh' + echo mount -t proc proc /proc + echo mount -t sysfs sysfs /sys + ) > $ROOTFS/do_mounts.sh + chmod +x $ROOTFS/do_mounts.sh ;; util-linux ) -- cgit From 90c5a8046f7c788b698765608dcc582f01567988 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Tue, 13 Nov 2012 14:02:08 -0700 Subject: clean up /proc, /sys mounts --- stage1 | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/stage1 b/stage1 index 6e189a0..c32eb49 100755 --- a/stage1 +++ b/stage1 @@ -914,13 +914,22 @@ EOF make busybox CROSS_COMPILE=${TARGET}- make install CONFIG_PREFIX=${ROOTFS} - # simple start up script to be invoked by hand, if desired + # add in some basic mount points + [ -d ${ROOTFS}/proc ] || mkdir ${ROOTFS}/proc + [ -d ${ROOTFS}/sys ] || mkdir ${ROOTFS}/sys ( - echo '#!/bin/sh' - echo mount -t proc proc /proc - echo mount -t sysfs sysfs /sys - ) > $ROOTFS/do_mounts.sh - chmod +x $ROOTFS/do_mounts.sh + 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 ) -- cgit