diff options
| author | Al Stone <ahs3@redhat.com> | 2012-11-17 15:02:52 -0700 |
|---|---|---|
| committer | Al Stone <ahs3@redhat.com> | 2012-11-17 15:02:52 -0700 |
| commit | 862d4ddba9a4961e6ffb66c53c843a91eb4fc4c6 (patch) | |
| tree | d7994f5f8fc15c629f0651eafcab4cb4155f0523 | |
| parent | f4886bb3d66726a51bece0d75f40ab7b4e83d4e2 (diff) | |
| parent | 9c9eed96db988b70106015e3e84ce60f731f1027 (diff) | |
| download | bootstrap.git.DONOTUSE-862d4ddba9a4961e6ffb66c53c843a91eb4fc4c6.tar.gz bootstrap.git.DONOTUSE-862d4ddba9a4961e6ffb66c53c843a91eb4fc4c6.tar.xz bootstrap.git.DONOTUSE-862d4ddba9a4961e6ffb66c53c843a91eb4fc4c6.zip | |
Merge branch 'aarch64-ahs3'
Signed-of-by: Al Stone <ahs3@redhat.com>
| -rw-r--r-- | recipe.d/0002-ncurses | 7 | ||||
| -rwxr-xr-x | stage1 | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/recipe.d/0002-ncurses b/recipe.d/0002-ncurses index f950766..23c2e7c 100644 --- a/recipe.d/0002-ncurses +++ b/recipe.d/0002-ncurses @@ -1,6 +1,7 @@ mcd $BUILDDIR/ncurses $SRC/ncurses-*/configure $TCONFIGARGS \ --with-shared --without-ada --with-ospeed=unsigned \ + --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo \ --enable-hard-tabs --enable-xmc-glitch --enable-colorfgbg \ --enable-overwrite \ --enable-pc-files \ @@ -11,6 +12,6 @@ make $J make $J install -echo "INPUT(-lncurses)" > /usr/lib/libcurses.so -echo "INPUT(-lncursesw)" > /usr/lib/libcursesw.so -echo "INPUT(-ltinfo)" > /usr/lib/libtermcap.so +echo "INPUT(-lncurses)" > /usr/lib$SUFFIX/libcurses.so +echo "INPUT(-lncursesw)" > /usr/lib$SUFFIX/libcursesw.so +echo "INPUT(-ltinfo)" > /usr/lib$SUFFIX/libtermcap.so @@ -943,6 +943,11 @@ EOF make busybox CROSS_COMPILE=${TARGET}- make install CONFIG_PREFIX=${ROOTFS} + # add in an password file for cleaniness (even if it has no passwd) + ( + echo "root::0:0:root:/:/bin/bash" + ) > $ROOTFS/etc/passwd + # add in some basic mount points [ -d ${ROOTFS}/proc ] || mkdir ${ROOTFS}/proc [ -d ${ROOTFS}/sys ] || mkdir ${ROOTFS}/sys @@ -950,10 +955,10 @@ EOF echo "proc /proc proc defaults 0 0" echo "sysfs /sys sysfs defaults 0 0" ) > $ROOTFS/etc/fstab + touch $ROOTFS/etc/mtab # 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" @@ -1105,9 +1110,10 @@ EOF | sed 's/--with-build-sysroot=[^ ]*//' \ | sed 's/--with-arch=armv8//' \ | sed 's/--with-fpu=neon-fp-armv8//' + echo SUFFIX=$SUFFIX echo export J DISTCC_HOSTS DISTCC_BACKOFF_PERIOD PATH - echo export TARGET RPMTARGET TCONFIGARGS + echo export TARGET RPMTARGET TCONFIGARGS SUFFIX ) > $ROOTFS/stage2/local.conf mcd $PREFIX/distccd-bin |