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

toolchain: remove old uname hack.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-12-31 02:45:19 +01:00
parent 1852d640e3
commit 920b610fa0
6 changed files with 5 additions and 17 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

2
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

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");