Merge remote-tracking branch 'origin/next' into thirteen

Conflicts:
	config/rootfiles/core/52/meta
	config/rootfiles/core/53/filelists/strongswan
	config/rootfiles/core/53/meta
	config/rootfiles/core/54/filelists/strongswan
	config/rootfiles/core/54/meta
	config/rootfiles/core/55/exclude
	config/rootfiles/core/55/meta
	config/rootfiles/core/56/exclude
	config/rootfiles/core/56/meta
	config/rootfiles/core/57/exclude
	config/rootfiles/core/57/filelists/strongswan
	config/rootfiles/core/57/meta
	config/rootfiles/core/58/exclude
	config/rootfiles/core/58/filelists/strongswan
	config/rootfiles/core/58/meta
	config/rootfiles/core/59/exclude
	config/rootfiles/core/59/filelists/strongswan
	config/rootfiles/core/59/meta
	config/rootfiles/core/strongswan/exclude
	config/rootfiles/core/strongswan/filelists/strongswan
	config/rootfiles/core/strongswan/meta
	config/rootfiles/oldcore/52/meta
	config/rootfiles/oldcore/53/filelists/strongswan
	config/rootfiles/oldcore/53/meta
	config/rootfiles/oldcore/54/filelists/strongswan
	config/rootfiles/oldcore/54/meta
	config/rootfiles/oldcore/55/exclude
	config/rootfiles/oldcore/55/meta
	config/rootfiles/oldcore/56/exclude
	config/rootfiles/oldcore/56/meta
	config/rootfiles/oldcore/57/exclude
	config/rootfiles/oldcore/57/filelists/strongswan
	config/rootfiles/oldcore/57/meta
	config/rootfiles/oldcore/58/exclude
	config/rootfiles/oldcore/58/filelists/strongswan
	config/rootfiles/oldcore/58/meta
	config/rootfiles/oldcore/59/exclude
	config/rootfiles/oldcore/59/filelists/strongswan
	config/rootfiles/oldcore/59/meta
	lfs/dhcp
This commit is contained in:
Arne Fitzenreiter
2012-09-20 07:45:00 +02:00
58 changed files with 7659 additions and 58 deletions

View File

@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/sbin \
--sysconfdir=/etc --localstatedir=/var \
--mandir=/usr/share/man --infodir=/usr/share/info \
--disable-logger --disable-syslogd
--disable-logger --disable-syslogd --disable-telnet --disable-telnetd
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
mv -v /usr/bin/ping /bin