From b7093f17d5eeafbe270c4999046fa90216d14a44 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 21 Apr 2017 17:09:17 +0200 Subject: [PATCH] stage1: New build script Creates some basic directories and symlinks in toolchain stage Signed-off-by: Michael Tremer --- lfs/Config | 8 ++++++++ lfs/glibc | 4 +--- lfs/stage1 | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ make.sh | 1 + 4 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 lfs/stage1 diff --git a/lfs/Config b/lfs/Config index c9f6a88ddd..d7d2a24a18 100644 --- a/lfs/Config +++ b/lfs/Config @@ -33,6 +33,14 @@ # Cleanup environment from any variables unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN +ifeq "$(BUILD_ARCH)" "aarch64" + IS_64BIT = 1 +endif + +ifeq "$(BUILD_ARCH)" "x86_64" + IS_64BIT = 1 +endif + # URLs that are common sources of downloads. If you're having trouble with # a site you should change its URL to that of a suitable mirror site. # diff --git a/lfs/glibc b/lfs/glibc index 6cb73119fe..4b69f18d48 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -143,9 +143,7 @@ endif cd $(DIR_SRC)/glibc-build && make install -ifeq "$(TOOLCHAIN)" "1" - ln -svf lib /tools/lib64 -else +ifneq "$(TOOLCHAIN)" "1" # Creating the locales mkdir -p /usr/lib/locale cd $(DIR_SRC)/glibc-build && make localedata/install-locales diff --git a/lfs/stage1 b/lfs/stage1 new file mode 100644 index 0000000000..c4c578411e --- /dev/null +++ b/lfs/stage1 @@ -0,0 +1,57 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = ipfire + +THISAPP = stage1 +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : + +download : + +md5 : + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : + @$(PREBUILD) + + mkdir -pv /tools/lib + +ifeq "$(IS_64BIT)" "1" + ln -svf lib /tools/lib64 +endif + + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 7b0249928d..4b1cea4a23 100755 --- a/make.sh +++ b/make.sh @@ -285,6 +285,7 @@ buildtoolchain() { LOGFILE="$BASEDIR/log/_build.toolchain.log" export LOGFILE + lfsmake1 stage1 lfsmake1 ccache PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 -- 2.39.2