This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 6206273045849859584cbe3dfb09d63327340532 (commit) via b190cbe2266b7af3f27188e5624a7e3b5fb1ddfc (commit) via fc8806bca7693ef418cf8a047cbfe82f76e38d98 (commit) from 22870c037560a37577fabfde824862981c792b0c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6206273045849859584cbe3dfb09d63327340532 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 28 13:05:00 2017 +0100
Rootfile update
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b190cbe2266b7af3f27188e5624a7e3b5fb1ddfc Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 28 13:01:14 2017 +0100
make.sh: Re-enable build of python3-libvirt
This line was dropped by accident in a merge conflict
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fc8806bca7693ef418cf8a047cbfe82f76e38d98 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 27 12:29:54 2017 +0100
bash: Correctly create link to /bin/sh
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/autoconf | 1 + config/rootfiles/common/tzdata | 1 + config/rootfiles/common/x86_64/binutils | 130 ++++++++++++++++++++++++++++++-- lfs/bash | 11 +-- make.sh | 1 + 5 files changed, 131 insertions(+), 13 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/autoconf b/config/rootfiles/common/autoconf index b398eb9..3e28ae7 100644 --- a/config/rootfiles/common/autoconf +++ b/config/rootfiles/common/autoconf @@ -54,6 +54,7 @@ #usr/share/autoconf/m4sugar/m4sugar.m4f #usr/share/autoconf/m4sugar/version.m4 #usr/share/info/autoconf.info +#usr/share/info/standards.info #usr/share/man/man1/autoconf.1 #usr/share/man/man1/autoheader.1 #usr/share/man/man1/autom4te.1 diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index 6148199..c44ad4a 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -1,3 +1,4 @@ +etc/localtime usr/share/zoneinfo #usr/share/zoneinfo/Africa #usr/share/zoneinfo/Africa/Abidjan diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils index bb0bf9b..88c1da3 100644 --- a/config/rootfiles/common/x86_64/binutils +++ b/config/rootfiles/common/x86_64/binutils @@ -19,6 +19,7 @@ #usr/include/bfdlink.h #usr/include/dis-asm.h #usr/include/libiberty.h +#usr/include/plugin-api.h #usr/include/symcat.h #usr/lib/ldscripts #usr/lib/ldscripts/elf32_x86_64.x @@ -47,6 +48,19 @@ #usr/lib/ldscripts/elf_i386.xsw #usr/lib/ldscripts/elf_i386.xu #usr/lib/ldscripts/elf_i386.xw +#usr/lib/ldscripts/elf_iamcu.x +#usr/lib/ldscripts/elf_iamcu.xbn +#usr/lib/ldscripts/elf_iamcu.xc +#usr/lib/ldscripts/elf_iamcu.xd +#usr/lib/ldscripts/elf_iamcu.xdc +#usr/lib/ldscripts/elf_iamcu.xdw +#usr/lib/ldscripts/elf_iamcu.xn +#usr/lib/ldscripts/elf_iamcu.xr +#usr/lib/ldscripts/elf_iamcu.xs +#usr/lib/ldscripts/elf_iamcu.xsc +#usr/lib/ldscripts/elf_iamcu.xsw +#usr/lib/ldscripts/elf_iamcu.xu +#usr/lib/ldscripts/elf_iamcu.xw #usr/lib/ldscripts/elf_k1om.x #usr/lib/ldscripts/elf_k1om.xbn #usr/lib/ldscripts/elf_k1om.xc @@ -91,23 +105,127 @@ #usr/lib/ldscripts/i386linux.xn #usr/lib/ldscripts/i386linux.xr #usr/lib/ldscripts/i386linux.xu -#usr/lib/libbfd-2.24.so +#usr/lib/libbfd-2.28.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so -#usr/lib/libiberty.a -#usr/lib/libopcodes-2.24.so +#usr/lib/libopcodes-2.28.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so #usr/share/info/as.info #usr/share/info/bfd.info #usr/share/info/binutils.info -#usr/share/info/configure.info -#usr/share/info/dir #usr/share/info/gprof.info #usr/share/info/ld.info -#usr/share/info/standards.info +#usr/share/locale/bg/LC_MESSAGES/binutils.mo +#usr/share/locale/bg/LC_MESSAGES/gprof.mo +#usr/share/locale/bg/LC_MESSAGES/ld.mo +#usr/share/locale/ca/LC_MESSAGES/binutils.mo +#usr/share/locale/da/LC_MESSAGES/bfd.mo +#usr/share/locale/da/LC_MESSAGES/binutils.mo +#usr/share/locale/da/LC_MESSAGES/gprof.mo +#usr/share/locale/da/LC_MESSAGES/ld.mo +#usr/share/locale/da/LC_MESSAGES/opcodes.mo +#usr/share/locale/de/LC_MESSAGES/gprof.mo +#usr/share/locale/de/LC_MESSAGES/opcodes.mo +#usr/share/locale/eo/LC_MESSAGES/gprof.mo +#usr/share/locale/es/LC_MESSAGES/bfd.mo +#usr/share/locale/es/LC_MESSAGES/binutils.mo +#usr/share/locale/es/LC_MESSAGES/gas.mo +#usr/share/locale/es/LC_MESSAGES/gprof.mo +#usr/share/locale/es/LC_MESSAGES/ld.mo +#usr/share/locale/es/LC_MESSAGES/opcodes.mo +#usr/share/locale/fi/LC_MESSAGES/bfd.mo +#usr/share/locale/fi/LC_MESSAGES/binutils.mo +#usr/share/locale/fi/LC_MESSAGES/gas.mo +#usr/share/locale/fi/LC_MESSAGES/gprof.mo +#usr/share/locale/fi/LC_MESSAGES/ld.mo +#usr/share/locale/fi/LC_MESSAGES/opcodes.mo +#usr/share/locale/fr/LC_MESSAGES/bfd.mo +#usr/share/locale/fr/LC_MESSAGES/binutils.mo +#usr/share/locale/fr/LC_MESSAGES/gas.mo +#usr/share/locale/fr/LC_MESSAGES/gprof.mo +#usr/share/locale/fr/LC_MESSAGES/ld.mo +#usr/share/locale/fr/LC_MESSAGES/opcodes.mo +#usr/share/locale/ga +#usr/share/locale/ga/LC_MESSAGES +#usr/share/locale/ga/LC_MESSAGES/gprof.mo +#usr/share/locale/ga/LC_MESSAGES/ld.mo +#usr/share/locale/ga/LC_MESSAGES/opcodes.mo +#usr/share/locale/hr/LC_MESSAGES/binutils.mo +#usr/share/locale/hu/LC_MESSAGES/gprof.mo +#usr/share/locale/id/LC_MESSAGES/bfd.mo +#usr/share/locale/id/LC_MESSAGES/binutils.mo +#usr/share/locale/id/LC_MESSAGES/gas.mo +#usr/share/locale/id/LC_MESSAGES/gprof.mo +#usr/share/locale/id/LC_MESSAGES/ld.mo +#usr/share/locale/id/LC_MESSAGES/opcodes.mo +#usr/share/locale/it/LC_MESSAGES/binutils.mo +#usr/share/locale/it/LC_MESSAGES/gprof.mo +#usr/share/locale/it/LC_MESSAGES/ld.mo +#usr/share/locale/it/LC_MESSAGES/opcodes.mo +#usr/share/locale/ja/LC_MESSAGES/bfd.mo +#usr/share/locale/ja/LC_MESSAGES/binutils.mo +#usr/share/locale/ja/LC_MESSAGES/gas.mo +#usr/share/locale/ja/LC_MESSAGES/gprof.mo +#usr/share/locale/ja/LC_MESSAGES/ld.mo +#usr/share/locale/ms +#usr/share/locale/ms/LC_MESSAGES +#usr/share/locale/ms/LC_MESSAGES/gprof.mo +#usr/share/locale/nl/LC_MESSAGES/gprof.mo +#usr/share/locale/nl/LC_MESSAGES/opcodes.mo +#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo +#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo +#usr/share/locale/ro +#usr/share/locale/ro/LC_MESSAGES +#usr/share/locale/ro/LC_MESSAGES/bfd.mo +#usr/share/locale/ro/LC_MESSAGES/binutils.mo +#usr/share/locale/ro/LC_MESSAGES/gprof.mo +#usr/share/locale/ro/LC_MESSAGES/opcodes.mo +#usr/share/locale/ru/LC_MESSAGES/bfd.mo +#usr/share/locale/ru/LC_MESSAGES/binutils.mo +#usr/share/locale/ru/LC_MESSAGES/gas.mo +#usr/share/locale/ru/LC_MESSAGES/gprof.mo +#usr/share/locale/rw/LC_MESSAGES/bfd.mo +#usr/share/locale/rw/LC_MESSAGES/binutils.mo +#usr/share/locale/rw/LC_MESSAGES/gas.mo +#usr/share/locale/rw/LC_MESSAGES/gprof.mo +#usr/share/locale/sk/LC_MESSAGES/binutils.mo +#usr/share/locale/sr +#usr/share/locale/sr/LC_MESSAGES +#usr/share/locale/sr/LC_MESSAGES/bfd.mo +#usr/share/locale/sr/LC_MESSAGES/binutils.mo +#usr/share/locale/sr/LC_MESSAGES/gprof.mo +#usr/share/locale/sv/LC_MESSAGES/bfd.mo +#usr/share/locale/sv/LC_MESSAGES/binutils.mo +#usr/share/locale/sv/LC_MESSAGES/gprof.mo +#usr/share/locale/sv/LC_MESSAGES/ld.mo +#usr/share/locale/sv/LC_MESSAGES/opcodes.mo +#usr/share/locale/tr/LC_MESSAGES/bfd.mo +#usr/share/locale/tr/LC_MESSAGES/binutils.mo +#usr/share/locale/tr/LC_MESSAGES/gas.mo +#usr/share/locale/tr/LC_MESSAGES/gprof.mo +#usr/share/locale/tr/LC_MESSAGES/ld.mo +#usr/share/locale/tr/LC_MESSAGES/opcodes.mo +#usr/share/locale/uk/LC_MESSAGES/bfd.mo +#usr/share/locale/uk/LC_MESSAGES/binutils.mo +#usr/share/locale/uk/LC_MESSAGES/gas.mo +#usr/share/locale/uk/LC_MESSAGES/gprof.mo +#usr/share/locale/uk/LC_MESSAGES/ld.mo +#usr/share/locale/uk/LC_MESSAGES/opcodes.mo +#usr/share/locale/vi/LC_MESSAGES/bfd.mo +#usr/share/locale/vi/LC_MESSAGES/binutils.mo +#usr/share/locale/vi/LC_MESSAGES/gprof.mo +#usr/share/locale/vi/LC_MESSAGES/ld.mo +#usr/share/locale/vi/LC_MESSAGES/opcodes.mo +#usr/share/locale/zh_CN/LC_MESSAGES/bfd.mo +#usr/share/locale/zh_CN/LC_MESSAGES/binutils.mo +#usr/share/locale/zh_CN/LC_MESSAGES/gas.mo +#usr/share/locale/zh_CN/LC_MESSAGES/ld.mo +#usr/share/locale/zh_CN/LC_MESSAGES/opcodes.mo +#usr/share/locale/zh_TW/LC_MESSAGES/binutils.mo +#usr/share/locale/zh_TW/LC_MESSAGES/ld.mo #usr/share/man/man1/addr2line.1 #usr/share/man/man1/ar.1 #usr/share/man/man1/as.1 diff --git a/lfs/bash b/lfs/bash index c215b5a..6e09c5b 100644 --- a/lfs/bash +++ b/lfs/bash @@ -99,13 +99,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
- ln -sf bash /bin/sh - -ifneq "$(ROOT)" "" - -mkdir -p $(ROOT)/bin - -mkdir -p $(ROOT)/usr/bin - ln -sf bash /tools/bin/sh - -ln -sf /tools/bin/bash $(ROOT)/bin/sh +ifeq "$(TOOLCHAIN)" "1" + ln -svf bash /tools/bin/sh +else + ln -svf bash /bin/sh endif
@rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 19e19a9..9092dd5 100755 --- a/make.sh +++ b/make.sh @@ -882,6 +882,7 @@ buildipfire() { lfsmake2 libpciaccess lfsmake2 libyajl lfsmake2 libvirt + lfsmake2 python3-libvirt lfsmake2 freeradius lfsmake2 perl-common-sense lfsmake2 perl-inotify2
hooks/post-receive -- IPFire 2.x development tree