webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-12-31 10:33:39 +01:00
parent 683cc8e470 0d738d2385
commit f4afa6ddf7
7 changed files with 8 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/rootfiles/common/coreutils
View File

@@ -20,8 +20,7 @@ bin/rmdir
bin/sleep
bin/sync
bin/true
#bin/uname
bin/uname.bak
bin/uname
etc/dircolors
usr/bin/[
usr/bin/basename

8
lfs/coreutils
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -108,15 +108,9 @@ ifeq "$(ROOT)" ""
mv -v /usr/bin/{head,sleep,nice} /bin
ln -sf test /bin/[
#ln -sf ../../bin/install /usr/bin
mv -f /bin/uname /bin/uname.bak
cp -vf $(DIR_SRC)/src/scripts/uname /bin/uname
chmod 755 /bin/uname
dircolors -p > /etc/dircolors
else
rm /tools/bin/hostname
mv -f /tools/bin/uname /tools/bin/uname.bak
cp -vf $(DIR_SRC)/src/scripts/uname /tools/bin/uname
chmod 755 /tools/bin/uname
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

3
lfs/flash-images
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -90,7 +90,6 @@ endif
echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
-touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep
mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname
mkdir $(MNThdd)/proc
mount --bind /proc $(MNThdd)/proc
mount --bind /dev $(MNThdd)/dev

3
lfs/xen-image
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -115,7 +115,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings
echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings
touch $(MNThdd)/lib/modules/$(KVER)-ipfire-xen/modules.dep
mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname
mkdir $(MNThdd)/proc
mount --bind /proc $(MNThdd)/proc
mount --bind /dev $(MNThdd)/dev

9
make.sh
View File

@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
MACHINE=`uname -m`
GIT_TAG=$(git tag | tail -1) # Git Tag
GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
TOOLCHAINVER=2
TOOLCHAINVER=3
BUILDMACHINE=$MACHINE
if [ "$MACHINE" = "x86_64" ]; then
@@ -240,7 +240,7 @@ buildtoolchain() {
;;
# ARM
armv5tel:armv5tel|armv5tel:armv5tejl)
armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l)
# These are working.
;;
armv5tel:*)
@@ -260,12 +260,11 @@ buildtoolchain() {
NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
ORG_PATH=$PATH
export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
lfsmake1 fake-environ PASS=1
lfsmake1 ccache PASS=1
lfsmake1 make PASS=1
lfsmake1 binutils PASS=1
lfsmake1 gcc PASS=1
export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
if [ "${MACHINE_TYPE}" = "arm" ]; then
lfsmake1 linux TOOLS=1 HEADERS=1
else
@@ -273,7 +272,7 @@ buildtoolchain() {
fi
lfsmake1 glibc
lfsmake1 cleanup-toolchain PASS=1
lfsmake1 fake-environ PASS=2
lfsmake1 fake-environ
lfsmake1 tcl
lfsmake1 expect
lfsmake1 dejagnu

3
src/install+setup/install/main.c
View File

@@ -463,9 +463,6 @@ int main(int argc, char *argv[])
/* Save language und local settings */
write_lang_configs(shortlangname);
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
/* mount proc filesystem */
mysystem("mkdir /harddisk/proc");
mysystem("/bin/mount --bind /proc /harddisk/proc");

32
src/scripts/uname
View File

@@ -1,32 +0,0 @@
#!/bin/sh
uname=
for i in /bin/uname.bak /tools/bin/uname.bak; do
if [ -x "$i" ]; then
uname=${i}
break
fi
done
if [ -z "${uname}" ]; then
exit 127
fi
machine=$(${uname} -m)
kernel=$(${uname} -r)
output=$(${uname} $@)
# Overwrite kernel version to hack kernel 3.x versions.
output=$(sed -e "s/${kernel}/${KVER}/g" <<<${output})
case "${machine}" in
armv*)
echo "${output}" | \
sed -e "s/armv.*l/${MACHINE}/g"
;;
i?86)
echo "${output}" | \
sed -e "s/i.86/${MACHINE}/g"
;;
esac