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

Merge commit 'origin/master' into next

Browse Source 
Conflicts:
	config/rootfiles/core/41/filelists/files
	src/paks/linux-pae/uninstall.sh
This commit is contained in:
Arne Fitzenreiter
2010-10-21 20:43:45 +02:00
parent 2165fbb2de 38a76ff405
commit c1cd3a8bf8
3 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
config/rootfiles/common/bzip2
View File

@@ -2,28 +2,26 @@ bin/bunzip2
bin/bzcat bin/bzcat
bin/bzip2 bin/bzip2
lib/libbz2.so.1.0 lib/libbz2.so.1.0
lib/libbz2.so.1.0.4 lib/libbz2.so.1.0.6
usr/lib/libbz2.so usr/bin/bunzip2
usr/local/bin/bunzip2 usr/bin/bzcat
usr/local/bin/bzcat usr/bin/bzcmp
#usr/local/bin/bzcmp usr/bin/bzdiff
#usr/local/bin/bzdiff usr/bin/bzegrep
#usr/local/bin/bzegrep usr/bin/bzfgrep
#usr/local/bin/bzfgrep usr/bin/bzgrep
#usr/local/bin/bzgrep usr/bin/bzip2
usr/local/bin/bzip2 usr/bin/bzip2recover
#usr/local/bin/bzip2recover usr/bin/bzless
#usr/local/bin/bzless usr/bin/bzmore
#usr/local/bin/bzmore usr/include/bzlib.h
usr/local/include/bzlib.h #usr/lib/libbz2.a
usr/local/lib/libbz2.a #usr/lib/libbz2.so
#usr/local/man #usr/man/man1/bzcmp.1
#usr/local/man/man1 #usr/man/man1/bzdiff.1
#usr/local/man/man1/bzcmp.1 #usr/man/man1/bzegrep.1
#usr/local/man/man1/bzdiff.1 #usr/man/man1/bzfgrep.1
#usr/local/man/man1/bzegrep.1 #usr/man/man1/bzgrep.1
#usr/local/man/man1/bzfgrep.1 #usr/man/man1/bzip2.1
#usr/local/man/man1/bzgrep.1 #usr/man/man1/bzless.1
#usr/local/man/man1/bzip2.1 #usr/man/man1/bzmore.1
#usr/local/man/man1/bzless.1
#usr/local/man/man1/bzmore.1

6
lfs/bzip2
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 1.0.5 VER = 1.0.6
THISAPP = bzip2-$(VER) THISAPP = bzip2-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3c15a0c8d1d3ee1c46a1634d00617b1a $(DL_FILE)_MD5 = 00b516f4704d4a7cb50a1d97e6e8e15b
install : $(TARGET) install : $(TARGET)
@@ -82,7 +82,7 @@ ifeq "$(ROOT)" ""
cd $(DIR_APP) && make -f Makefile-libbz2_so cd $(DIR_APP) && make -f Makefile-libbz2_so
cd $(DIR_APP) && make clean cd $(DIR_APP) && make clean
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install PREFIX=/usr
cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2 cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2
cd $(DIR_APP) && cp -av libbz2.so* /lib cd $(DIR_APP) && cp -av libbz2.so* /lib
ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so

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

@@ -23,7 +23,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } };
extern char *en_tr[]; extern char *en_tr[];
extern char *de_tr[]; extern char *de_tr[];
extern char *fr_tr[]; extern char *fr_tr[];
extern char *es_tr[];
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@@ -31,8 +31,8 @@ int main(int argc, char *argv[])
char *shortlangnames[] = { "en", NULL }; char *shortlangnames[] = { "en", NULL };
char **langtrs[] = { en_tr, NULL }; char **langtrs[] = { en_tr, NULL };
#else #else
char *shortlangnames[] = { "de", "en", "fr", NULL }; char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
char **langtrs[] = { de_tr, en_tr, fr_tr, NULL }; char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
#endif #endif
int choice; int choice;
char *sections[11]; /* need to fill this out AFTER knowning lang */ char *sections[11]; /* need to fill this out AFTER knowning lang */