Context Navigation

← Previous Changeset
Next Changeset →

Changeset 472

Timestamp:

10/04/07 08:30:37 (4 years ago)

Author:

andi

Message:

/var directory will be JFFS2 (instead of /conf)
fix cleanup-root.sh for correct handling (initial /var)
update buildroot Makefile (do not symlink /var)
update owi Makefile (correct cleanup code)

Location:

trunk/openmct

Files:

: 19 modified
: 1 moved

Makefile (modified) (3 diffs)
Rules (modified) (2 diffs)
packages/build/buildetc/Makefile (modified) (2 diffs)
packages/build/buildetc/src/etc/TZ (modified) (1 diff)
packages/build/buildetc/src/etc/exports (modified) (1 diff)
packages/build/buildetc/src/etc/fstab (modified) (1 diff)
packages/build/buildetc/src/etc/group (modified) (1 diff)
packages/build/buildetc/src/etc/hostname (modified) (1 diff)
packages/build/buildetc/src/etc/hosts (modified) (1 diff)
packages/build/buildetc/src/etc/issue (modified) (1 diff)
packages/build/buildetc/src/etc/network (modified) (1 diff)
packages/build/buildetc/src/etc/passwd (modified) (1 diff)
packages/build/buildetc/src/etc/rc.conf (modified) (1 diff)
packages/build/buildetc/src/etc/samba (modified) (1 diff)
packages/build/buildetc/src/etc/vservers (modified) (1 diff)
packages/build/buildetc/src/etc/vsftpd.conf (modified) (1 diff)
packages/build/buildetc/src/var (moved) (moved from trunk/openmct/packages/build/buildetc/src/conf)
packages/build/buildroot/Makefile (modified) (1 diff)
packages/system/owi/Makefile (modified) (1 diff)
scripts/cleanup-root.sh (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/openmct/Makefile

r445	r472
91	91	@$(MKDIR) $(OUTPUTDIR)
92	92
93		$(OUTPUTDIR)/$(KERNEL): packages/system/linux/$(SRCDIR)/$(CONFIG) $(NEWROOTDIR) $(NEW~~CONF~~DIR)
	93	$(OUTPUTDIR)/$(KERNEL): packages/system/linux/$(SRCDIR)/$(CONFIG) $(NEWROOTDIR) $(NEWVARDIR)
94	94	@$(MAKE) -C packages/system/linux OPENMCT_DEVEL_PREFIX=$(ACTDIR)/ do-build
95	95	@$(MAKE) -C packages/system/linux OPENMCT_DEVEL_PREFIX=$(ACTDIR)/ do-install
…	…
113	113	endif
114	114
115		$(NEW~~CONF~~DIR):
	115	$(NEWVARDIR):
116	116	@$(MAKE) -C packages/build/buildetc OPENMCT_DEVEL_PREFIX=$(ACTDIR)/ do-all
117	117	@$(ECHO) -e "\033[1;33mCREATE \033[1;32m/etc/$(IMAGERELEASEFILENAME)\033[0m"
118	118	@$(ECHO) "OpenMCT $(IMAGEVERSION) $(IMAGESUBVERSION) $(IMAGEPRODCODE)" > $(NEWROOTDIR)/etc/$(IMAGERELEASEFILENAME)
119	119	@$(ECHO) -e "\033[1;33mCREATE \033[1;32m/etc/hostname\033[0m"
120		@$(ECHO) $(IMAGETARGET) > $(NEW~~CONF~~DIR)/etc/hostname
	120	@$(ECHO) $(IMAGETARGET) > $(NEWVARDIR)/etc/hostname
121	121	@$(ECHO) -e "\033[1;33mCREATE \033[1;32m/etc/issue\033[0m"
122		@$(ECHO) "Welcome on OpenMCT $(IMAGEVERSION) - Kernel \r (\t)" > $(NEW~~CONF~~DIR)/etc/issue
	122	@$(ECHO) "Welcome on OpenMCT $(IMAGEVERSION) - Kernel \r (\t)" > $(NEWVARDIR)/etc/issue
123	123	ifdef ETH0IPADDR
124	124	@$(ECHO) -e "\033[1;33mCONFIGURE \033[1;32meth0\033[0m"
125		@$(ECHO) "auto eth0" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
126		@$(ECHO) "iface eth0 inet static" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
127		@$(ECHO) -e "\taddress $(ETH0IPADDR)" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	125	@$(ECHO) "auto eth0" >> $(NEWVARDIR)/etc/network/interfaces
	126	@$(ECHO) "iface eth0 inet static" >> $(NEWVARDIR)/etc/network/interfaces
	127	@$(ECHO) -e "\taddress $(ETH0IPADDR)" >> $(NEWVARDIR)/etc/network/interfaces
128	128	ifdef ETH0NETMASK
129		@$(ECHO) -e "\tnetmask $(ETH0NETMASK)" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	129	@$(ECHO) -e "\tnetmask $(ETH0NETMASK)" >> $(NEWVARDIR)/etc/network/interfaces
130	130	else
131		@$(ECHO) -e "\tnetmask 255.255.255.0" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	131	@$(ECHO) -e "\tnetmask 255.255.255.0" >> $(NEWVARDIR)/etc/network/interfaces
132	132	endif
133	133	ifdef ETH0DEFAULTGW
134		@$(ECHO) -e "\tgateway $(ETH0DEFAULTGW)" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	134	@$(ECHO) -e "\tgateway $(ETH0DEFAULTGW)" >> $(NEWVARDIR)/etc/network/interfaces
135	135	endif
136		@$(ECHO) "" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	136	@$(ECHO) "" >> $(NEWVARDIR)/etc/network/interfaces
137	137	@$(ECHO) -e "\033[1;33mCREATE \033[1;32m/etc/hosts\033[0m"
138		@$(ECHO) $(ETH0IPADDR) $(IMAGETARGET) > $(NEW~~CONF~~DIR)/etc/hosts
	138	@$(ECHO) $(ETH0IPADDR) $(IMAGETARGET) > $(NEWVARDIR)/etc/hosts
139	139	endif
140	140	ifdef ETH1IPADDR
141	141	@$(ECHO) -e "\033[1;33mCONFIGURE \033[1;32meth1\033[0m"
142		@$(ECHO) "auto eth1" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
143		@$(ECHO) "iface eth1 inet static" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
144		@$(ECHO) -e "\taddress $(ETH1IPADDR)" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	142	@$(ECHO) "auto eth1" >> $(NEWVARDIR)/etc/network/interfaces
	143	@$(ECHO) "iface eth1 inet static" >> $(NEWVARDIR)/etc/network/interfaces
	144	@$(ECHO) -e "\taddress $(ETH1IPADDR)" >> $(NEWVARDIR)/etc/network/interfaces
145	145	ifdef ETH1NETMASK
146		@$(ECHO) -e "\tnetmask $(ETH1NETMASK)" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	146	@$(ECHO) -e "\tnetmask $(ETH1NETMASK)" >> $(NEWVARDIR)/etc/network/interfaces
147	147	else
148		@$(ECHO) -e "\tnetmask 255.255.255.0" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	148	@$(ECHO) -e "\tnetmask 255.255.255.0" >> $(NEWVARDIR)/etc/network/interfaces
149	149	endif
150	150	ifdef ETH1DEFAULTGW
151		@$(ECHO) -e "\tgateway $(ETH1DEFAULTGW)" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	151	@$(ECHO) -e "\tgateway $(ETH1DEFAULTGW)" >> $(NEWVARDIR)/etc/network/interfaces
152	152	endif
153		@$(ECHO) "" >> $(NEW~~CONF~~DIR)/etc/network/interfaces
	153	@$(ECHO) "" >> $(NEWVARDIR)/etc/network/interfaces
154	154	endif
155		@$(CP) $(NEW~~CONF~~DIR)/etc/network/interfaces $(NEWROOTDIR)/etc/default/interfaces
	155	@$(CP) $(NEWVARDIR)/etc/network/interfaces $(NEWROOTDIR)/etc/default/interfaces
156	156
157	157	$(OUTPUTDIR)/$(ROOT):
…	…
161	161	$(OUTPUTDIR)/$(MKSQUASHFS) $(NEWROOTDIR) $(OUTPUTDIR)/$(ROOT) $(ROOTOPTS)
162	162
163		$(OUTPUTDIR)/$(ETC):
164		@$(ECHO) -e "\033[1;33mREMOVE .svn FROM $(NEWCONFDIR)"
165		@$(REMOVESVN) $(NEWCONFDIR)
166		@$(ECHO) -e "\033[1;33mCREATE \033[1;32m$(ETC)\033[0m"
167		@$(MKFSJFFS2) -d $(NEWCONFDIR) -o $(OUTPUTDIR)/$(ETC) $(ETCOPTS)
168
	163	$(OUTPUTDIR)/$(VAR):
	164	@$(ECHO) -e "\033[1;33mREMOVE .svn FROM $(NEWVARDIR)"
	165	@$(REMOVESVN) $(NEWVARDIR)
	166	@$(ECHO) -e "\033[1;33mCREATE \033[1;32m$(VAR)\033[0m"
	167	@$(MKFSJFFS2) -d $(NEWVARDIR) -o $(OUTPUTDIR)/$(VAR)
169	168
170	169	$(IMAGEFILENAME): $(OUTPUTDIR)/$(MCT_MODIFY) $(OUTPUTDIR)/$(MKSQUASHFS) $(OUTPUTDIR)/$(KERNEL) pkg $(OUTPUTDIR)/$(ROOT) $(OUTPUTDIR)/$(ETC)

trunk/openmct/Rules

r456	r472
39	39	ROOTDIR=$(OUTPUTDIR)/root
40	40	NEWROOTDIR=$(OUTPUTDIR)/newroot
41		NEW~~CONFDIR=$(OUTPUTDIR)/newconf~~
	41	NEWVARDIR=$(OUTPUTDIR)/newvar
42	42	SCRIPTDIR=$(OPENMCT_DEVEL_PREFIX)/scripts
43	43	SRCDIR=src
…	…
65	65	KERNEL=$(VMLINUXBIN).gz
66	66	ROOT=root.bin
67		~~ETC=etc~~.bin
	67	VAR=var.bin
68	68	MCT_MODIFY=mct_modify
69	69	MKSQUASHFS=mksquashfs

trunk/openmct/packages/build/buildetc/Makefile

r436	r472
4	4	$(CP) -a $(SRCDIR)/etc $(NEWROOTDIR)/etc ; \
5	5	fi && \
6		if [ ! -d $(NEW~~CONF~~DIR) ]; then \
7		$(CP) -a $(SRCDIR)/~~conf $(NEWCONF~~DIR); \
	6	if [ ! -d $(NEWVARDIR) ]; then \
	7	$(CP) -a $(SRCDIR)/var/etc $(NEWVARDIR); \
8	8	fi
9	9
…	…
11	11	$(RM) -rf $(NEWROOTDIR)/etc ; \
12	12	fi && \
13		if [ -d $(NEW~~CONF~~DIR) ]; then \
14		$(RM) -rf $(NEW~~CONF~~DIR); \
	13	if [ -d $(NEWVARDIR) ]; then \
	14	$(RM) -rf $(NEWVARDIR); \
15	15	fi
16	16

trunk/openmct/packages/build/buildetc/src/etc/TZ

r433	r472
1		link /~~conf~~/etc/TZ
	1	link /var/etc/TZ

trunk/openmct/packages/build/buildetc/src/etc/exports

r433	r472
1		link /~~conf~~/etc/exports
	1	link /var/etc/exports

trunk/openmct/packages/build/buildetc/src/etc/fstab

r442	r472
1	1	proc /proc proc defaults 0 0
2	2	tmpfs /tmp ramfs defaults 0 0
3		/dev/mtdblock/3 /~~conf~~ jffs2 defaults 0 0
	3	/dev/mtdblock/3 /var jffs2 defaults 0 0
4	4	/dev/discs/disc0/part1 /usr ext3 defaults 0 0

trunk/openmct/packages/build/buildetc/src/etc/group

r433	r472
1		link /~~conf~~/etc/group
	1	link /var/etc/group

trunk/openmct/packages/build/buildetc/src/etc/hostname

r433	r472
1		link /~~conf~~/etc/hostname
	1	link /var/etc/hostname

trunk/openmct/packages/build/buildetc/src/etc/hosts

r433	r472
1		link /~~conf~~/etc/hosts
	1	link /var/etc/hosts

trunk/openmct/packages/build/buildetc/src/etc/issue

r433	r472
1		link /~~conf~~/etc/issue
	1	link /var/etc/issue

trunk/openmct/packages/build/buildetc/src/etc/network

r433	r472
1		link /~~conf~~/etc/network
	1	link /var/etc/network

trunk/openmct/packages/build/buildetc/src/etc/passwd

r433	r472
1		link /~~conf~~/etc/passwd
	1	link /var/etc/passwd

trunk/openmct/packages/build/buildetc/src/etc/rc.conf

r442	r472
1		link /~~conf~~/etc/rc.conf
	1	link /var/etc/rc.conf

trunk/openmct/packages/build/buildetc/src/etc/samba

r433	r472
1		link /~~conf~~/etc/samba
	1	link /var/etc/samba

trunk/openmct/packages/build/buildetc/src/etc/vservers

r433	r472
1		link /~~conf~~/etc/vservers
	1	link /var/etc/vservers

trunk/openmct/packages/build/buildetc/src/etc/vsftpd.conf

r433	r472
1		link /~~conf~~/etc/vsftpd.conf
	1	link /var/etc/vsftpd.conf

trunk/openmct/packages/build/buildroot/Makefile

r427	r472
8	8	$(CP) -a $(ROOTDIR) $(NEWROOTDIR) ; \
9	9	$(CLEANUPROOT) $(NEWROOTDIR) ; \
10		~~$(LN) -s ../etc/var $(NEWROOTDIR)/var ; \~~
11	10	fi
12	11

trunk/openmct/packages/system/owi/Makefile

r449	r472
5	5	make install DESTDIR=$(NEWROOTDIR)/www
6	6
	7	CLEAN= cd $(SRCDIR) && make clean
	8
7	9	include $(OPENMCT_DEVEL_PREFIX)Rules

trunk/openmct/scripts/cleanup-root.sh

r446	r472
13	13	mkdir $1/usr/var
14	14	mkdir $1/usr/vservers
	15	mkdir $1/var
15	16	ln -s usr/home $1/home
16		~~ln -s usr/var $1/var~~
17	17	ln -s usr/vservers $1/vservers
18	18	fi

Context Navigation

Changeset 472

Legend:

Download in other formats: