Menu
▾
▴
[Devil-linux-commit] build CHANGES, 1.1328, 1.1329 Makefile.build, 1.2, 1.3 Makefile.build.custom, 1.1, 1.2 Makefile.install, 1.2, 1.3 Makefile.iso, 1.2, 1.3 Makefile.prepare, 1.2, 1.3
|
From: Heiko Z. <smi...@us...> - 2010-01-09 15:54:19
|
Update of /cvsroot/devil-linux/build In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8250 Modified Files: CHANGES Makefile.build Makefile.build.custom Makefile.install Makefile.iso Makefile.prepare Log Message: - closed bug #53 - use "ip" instead of "ifconfig" commands in /etc/init.d/network (Roland Pabel / Heiko Zuerker) - build system: compile findutils right after glibc, because of xargs errors after updating glibc - added new dependency group to Makefile.build: GROUP_CUSTOM_BEFORE_KERNEL Index: Makefile.build.custom =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build.custom,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile.build.custom 6 Jan 2010 14:35:14 -0000 1.1 +++ Makefile.build.custom 9 Jan 2010 15:54:08 -0000 1.2 @@ -14,6 +14,10 @@ #GROUP_CUSTOM := yourscript1 yourscript2 GROUP_CUSTOM := +# list any scripts in this group, which need to run before the Linux kernel +# (build phase only) +GROUP_CUSTOM_BEFORE_KERNEL := + # End of dependencies #yourscript1: Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.build 6 Jan 2010 14:35:14 -0000 1.2 +++ Makefile.build 9 Jan 2010 15:54:08 -0000 1.3 @@ -13,6 +13,8 @@ GROUP_08 := glibc +GROUP_10 := findutils + GROUP_13 := Libnet attr bzip2 cgilib cracklib \ ctags db-4 expat freetype gdbm \ gifsicle id3lib jpeg libHX libart \ @@ -21,7 +23,7 @@ libol libosip2 libpcap libtirpc libungif \ libusb lzo mhash mktemp ncurses \ pax-utils paxctl pcre popt readline \ - tcp_wrappers uClibc which zlib + tcp_wrappers uClibc which zlib GROUP_14 := Linux-PAM acl gmp gnupg libdnet \ libdvdread libgcrypt libmcrypt libpng libxml2 \ @@ -46,7 +48,7 @@ dhcp dhcpcd dialog diffutils djbdns \ dnsmasq dosfstools dovecot dst dvd+rw-tools \ ebtables ether-wake ethtool eventlog ez-ipupdate \ - fblogo fetchmail file findutils fprobe \ + fblogo fetchmail file fprobe \ fprobe-ulog freeramdisk fwlogwatch gawk gperf \ grep groff grsecurity grub gzip \ hdparm hostap-driver i2c id3 id3v2 \ @@ -108,100 +110,103 @@ GROUP_26 := alsa-utils ipsec-tools # End of dependencies -.PHONY: all -all : $(GROUP_01) $(GROUP_08) $(GROUP_13) $(GROUP_14) $(GROUP_15) $(GROUP_16) $(GROUP_17) $(GROUP_19) $(GROUP_20) $(GROUP_21) $(GROUP_22) $(GROUP_23) $(GROUP_24) $(GROUP_25) $(GROUP_26) $(GROUP_CUSTOM) +.PHONY: all -prepare: +all : $(GROUP_01) $(GROUP_08) $(GROUP_10) $(GROUP_13) $(GROUP_14) $(GROUP_15) $(GROUP_16) $(GROUP_17) \ + $(GROUP_19) $(GROUP_20) $(GROUP_21) $(GROUP_22) $(GROUP_23) $(GROUP_24) $(GROUP_25) \ + $(GROUP_26) ($(GROUP_CUSTOM_BEFORE_KERNEL) $(GROUP_CUSTOM) + +prepare: glibc: | $(GROUP_01) -Libnet: | $(GROUP_08) +Libnet: | $(GROUP_10) -attr: | $(GROUP_08) +attr: | $(GROUP_10) -bzip2: | $(GROUP_08) +bzip2: | $(GROUP_10) -cgilib: | $(GROUP_08) +cgilib: | $(GROUP_10) -cracklib: | $(GROUP_08) +cracklib: | $(GROUP_10) -ctags: | $(GROUP_08) +ctags: | $(GROUP_10) -db-4: | $(GROUP_08) +db-4: | $(GROUP_10) -expat: | $(GROUP_08) +expat: | $(GROUP_10) -freetype: | $(GROUP_08) +freetype: | $(GROUP_10) -gdbm: | $(GROUP_08) +gdbm: | $(GROUP_10) -gifsicle: | $(GROUP_08) +gifsicle: | $(GROUP_10) -id3lib: | $(GROUP_08) +id3lib: | $(GROUP_10) -jpeg: | $(GROUP_08) +jpeg: | $(GROUP_10) -libHX: | $(GROUP_08) +libHX: | $(GROUP_10) -libart: | $(GROUP_08) +libart: | $(GROUP_10) -libcap: | $(GROUP_08) +libcap: | $(GROUP_10) -libdbi: | $(GROUP_08) +libdbi: | $(GROUP_10) -libdvdcss: | $(GROUP_08) +libdvdcss: | $(GROUP_10) -libevent: | $(GROUP_08) +libevent: | $(GROUP_10) -libgpg-error: | $(GROUP_08) +libgpg-error: | $(GROUP_10) -libiconv: | $(GROUP_08) +libiconv: | $(GROUP_10) -libmad: | $(GROUP_08) +libmad: | $(GROUP_10) -libnfnetlink: | $(GROUP_08) +libnfnetlink: | $(GROUP_10) -libnfsidmap: | $(GROUP_08) +libnfsidmap: | $(GROUP_10) -libnl: | $(GROUP_08) +libnl: | $(GROUP_10) -libol: | $(GROUP_08) +libol: | $(GROUP_10) -libosip2: | $(GROUP_08) +libosip2: | $(GROUP_10) -libpcap: | $(GROUP_08) +libpcap: | $(GROUP_10) -libtirpc: | $(GROUP_08) +libtirpc: | $(GROUP_10) -libungif: | $(GROUP_08) +libungif: | $(GROUP_10) -libusb: | $(GROUP_08) +libusb: | $(GROUP_10) -lzo: | $(GROUP_08) +lzo: | $(GROUP_10) -mhash: | $(GROUP_08) +mhash: | $(GROUP_10) -mktemp: | $(GROUP_08) +mktemp: | $(GROUP_10) -ncurses: | $(GROUP_08) +ncurses: | $(GROUP_10) -pax-utils: | $(GROUP_08) +pax-utils: | $(GROUP_10) -paxctl: | $(GROUP_08) +paxctl: | $(GROUP_10) -pcre: | $(GROUP_08) +pcre: | $(GROUP_10) -popt: | $(GROUP_08) +popt: | $(GROUP_10) -readline: | $(GROUP_08) +readline: | $(GROUP_10) -tcp_wrappers: | $(GROUP_08) +tcp_wrappers: | $(GROUP_10) -uClibc: | $(GROUP_08) +uClibc: | $(GROUP_10) -which: | $(GROUP_08) +which: | $(GROUP_10) -zlib: | $(GROUP_08) +zlib: | $(GROUP_10) Linux-PAM: | $(GROUP_13) @@ -381,7 +386,7 @@ file: | $(GROUP_17) -findutils: | $(GROUP_17) +findutils: | $(GROUP_08) fprobe: | $(GROUP_17) @@ -791,7 +796,7 @@ xmbmon: | $(GROUP_20) -linux: | $(GROUP_21) +linux: | $(GROUP_21) $(GROUP_CUSTOM_BEFORE_KERNEL) net-snmp: | $(GROUP_21) Index: Makefile.prepare =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.prepare,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.prepare 6 Jan 2010 14:58:38 -0000 1.2 +++ Makefile.prepare 9 Jan 2010 15:54:08 -0000 1.3 @@ -18,7 +18,8 @@ GROUP_11 := automake dev86 # End of dependencies -.PHONY: all +.PHONY: all + all : $(GROUP_01) $(GROUP_05) $(GROUP_06) $(GROUP_07) $(GROUP_09) $(GROUP_10) $(GROUP_11) $(GROUP_CUSTOM) prepare: @@ -42,3 +43,4 @@ automake: | $(GROUP_10) dev86: | $(GROUP_10) + Index: Makefile.iso =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.iso,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.iso 6 Jan 2010 14:58:38 -0000 1.2 +++ Makefile.iso 9 Jan 2010 15:54:08 -0000 1.3 @@ -14,10 +14,11 @@ GROUP_02 := build-iso # End of dependencies -.PHONY: all +.PHONY: all + all : $(GROUP_01) $(GROUP_02) $(GROUP_CUSTOM) -prepare: +prepare: build-iso: | $(GROUP_01) Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1328 retrieving revision 1.1329 diff -u -d -r1.1328 -r1.1329 --- CHANGES 6 Jan 2010 19:58:05 -0000 1.1328 +++ CHANGES 9 Jan 2010 15:54:08 -0000 1.1329 @@ -22,6 +22,9 @@ # 1.4RC3 +- closed bug #53 - use "ip" instead of "ifconfig" commands in /etc/init.d/network (Roland Pabel / Heiko Zuerker) +- build system: compile findutils right after glibc, because of xargs errors after updating glibc +- added new dependency group to Makefile.build: GROUP_CUSTOM_BEFORE_KERNEL - closed feature request #54:- remove insserv remnants from build scripts (bs) - build system: - added additional Makefiles for custom scripts which are not part of DL Index: Makefile.install =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.install,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.install 6 Jan 2010 14:58:38 -0000 1.2 +++ Makefile.install 9 Jan 2010 15:54:08 -0000 1.3 @@ -114,10 +114,14 @@ GROUP_31 := setfiledates # End of dependencies -.PHONY: all -all : $(GROUP_01) $(GROUP_02) $(GROUP_03) $(GROUP_04) $(GROUP_05) $(GROUP_05) $(GROUP_05) $(GROUP_08) $(GROUP_13) $(GROUP_14) $(GROUP_15) $(GROUP_16) $(GROUP_17) $(GROUP_19) $(GROUP_20) $(GROUP_21) $(GROUP_22) $(GROUP_23) $(GROUP_24) $(GROUP_25) $(GROUP_26) $(GROUP_28) $(GROUP_29) $(GROUP_30) $(GROUP_31) $(GROUP_CUSTOM) +.PHONY: all -prepare: +all : $(GROUP_01) $(GROUP_02) $(GROUP_03) $(GROUP_04) $(GROUP_05) $(GROUP_05) $(GROUP_05) \ + $(GROUP_08) $(GROUP_13) $(GROUP_14) $(GROUP_15) $(GROUP_16) $(GROUP_17) $(GROUP_19) \ + $(GROUP_20) $(GROUP_21) $(GROUP_22) $(GROUP_23) $(GROUP_24) $(GROUP_25) $(GROUP_26) \ + $(GROUP_28) $(GROUP_29) $(GROUP_30) $(GROUP_31) $(GROUP_CUSTOM) + +prepare: create_cd_dirs: | $(GROUP_01) |
