From f8299fa80b1a1fd5572da35a593d26b0f7c6298a Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 18 Apr 2010 20:00:16 +0200 Subject: Rootfs: separate device nodes build and tar.bz2 rootfs build Signed-off-by: Abdoulaye Walsimou Gaye --- mk/fs.mk | 31 ++++++++++++++++++------------- mk/rootfs.mk | 24 +++++++++++++----------- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/mk/fs.mk b/mk/fs.mk index 6ceb778..af09cd7 100644 --- a/mk/fs.mk +++ b/mk/fs.mk @@ -1,19 +1,20 @@ ################################################################################ # GAYE Abdoulaye Walsimou, -# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved. +# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. # -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License -# (Version 2 or later) published by the Free Software Foundation. +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ################################################################################ # # \file fs.mk @@ -22,12 +23,16 @@ # \date August 2009 ################################################################################ -build_tarbz2_rootfs: - $(call EMBTK_GENERIC_MESSAGE,"Generating tar.bz2 file of the root \ +build_rootfs_devnodes: + $(call EMBTK_GENERIC_MESSAGE,"Populating device nodes of the root \ filesystem...") @$(FAKEROOT_BIN) -s $(EMBTK_ROOT)/.fakeroot.001 -- \ $(MAKEDEVS_DIR)/makedevs \ -d $(EMBTK_ROOT)/src/devices_table.txt $(ROOTFS) + +build_tarbz2_rootfs: + $(call EMBTK_GENERIC_MESSAGE,"Generating tar.bz2 file of the root \ + filesystem...") @cd $(ROOTFS) ; $(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \ tar cjf rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).tar.bz2 * ; \ mv rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).tar.bz2 $(EMBTK_ROOT) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 9504b86..b846e67 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -2,18 +2,19 @@ # GAYE Abdoulaye Walsimou, # Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved. # -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License -# (Version 2 or later) published by the Free Software Foundation. +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ################################################################################ # # \file rootfs.mk @@ -55,7 +56,8 @@ endif rootfs_build: $(call EMBTK_GENERIC_MESSAGE,"Building selected root filesystems...") @$(MAKE) rootfs_clean mkinitialrootfs $(ROOTFS_HOSTTOOLS-y) \ - $(ROOTFS_COMPONENTS-y) rootfs_fill build_tarbz2_rootfs $(FILESYSTEMS-y) + $(ROOTFS_COMPONENTS-y) build_rootfs_devnodes rootfs_fill \ + build_tarbz2_rootfs $(FILESYSTEMS-y) $(Q)rm -rf $(ROOTFS) $(call EMBTK_GENERIC_MESSAGE,"Build of selected root filesystems \ ended successfully!") -- cgit v1.2.3