Makefile: Add userspace-prep dependency to various targets

As that will allow us to make this more parallel.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/root_image/Makefile b/root_image/Makefile
index ffdea882875fbde277b493211825af17cf8a9fd8..9bd9675091a698e19ff369373da93cacb0637d17 100644 (file)
--- a/root_image/Makefile
+++ b/root_image/Makefile
@@ -205,13 +205,14 @@ ifeq ($(NO_LDD_CHECK),)
        find userspace/ -type f | xargs ./ldd-check.pl
 endif
        find userspace/ -name qemu-dm -type f -executable | xargs strip -d
+       #find userspace/ -name qemu-system-i386 -type f -executable | xargs strip -d
 
 .PHONY:        root_image-clean
 root_image-clean:
        rm -fr userspace modulespace $(DISTDIR)
 
 .PHONY:        add-libs
-add-libs: userspace-prep root_image-tools-install 
+add-libs: userspace-prep root_image-tools-install
 ifeq ($(RPM_ARCH), x86_64)
        $(call RPM_TO_USERSPACE,*ld-linux-x86-64.so*,$(RPM_DIR)/glibc)
 else
@@ -307,7 +308,7 @@ endif
        $(call RPM_TO_USERSPACE_ALWAYS,*/usr/share/zoneinfo/*,$(RPM_DIR)/tzdata)
 
 .PHONY:        add-bins
-add-bins: userspace-prep  
+add-bins: userspace-prep
        mkdir -p userspace/usr/share
        $(call RPM_TO_USERSPACE,./sbin/mkfs.ext3,$(RPM_DIR)/e2fsprogs)
        $(call RPM_TO_USERSPACE,./sbin/fsck.ext3,$(RPM_DIR)/e2fsprogs)
@@ -393,7 +394,7 @@ endif
        $(call RPM_TO_USERSPACE,./usr/share/hwdata/usb.ids,$(RPM_DIR)/hwdata)
 
 .PHONY:        udev-install
-udev-install: userspace-prep 
+udev-install: userspace-prep
 ifdef FC12_RPM
        $(call RPM_TO_USERSPACE,*libudev.so*,$(RPM_DIR)/libudev)
 else
@@ -407,11 +408,11 @@ endif
        $(call RPM_TO_USERSPACE_ALWAYS,\*lib/udev/\*,$(RPM_DIR)/udev)
 
 .PHONY: tools-lib
-tools-lib:
+tools-lib: userspace-prep
        $(call RPM_TO_USERSPACE,*libglib*.so*,$(RPM_DIR)/glib2)
 
 .PHONY:        tools-install
-tools-install: tools-lib userspace-prep 
+tools-install: tools-lib
        mkdir -p userspace/var/lib/nfs
        mkdir -p userspace/var/lib/nfs/sm
        mkdir -p userspace/var/lib/nfs/sm.bak
@@ -542,11 +543,11 @@ endif
 
 
 .PHONY: wget-install
-wget-install:
+wget-install: userspace-prep
        $(call RPM_TO_USERSPACE,./usr/bin/wget,$(RPM_DIR)/wget)
 
 .PHONY: vim-install
-vim-install:
+vim-install: userspace-prep
        $(call RPM_TO_USERSPACE,*/libperl.so,$(RPM_DIR)/perl-libs)
 ifndef FC13
        # don't do this under FC13.
@@ -561,7 +562,7 @@ endif
        $(call RPM_TO_USERSPACE,./usr/bin/vim,$(RPM_DIR)/vim-enhanced)
 
 .PHONY:        openssh-lib-deps
-openssh-lib-deps:
+openssh-lib-deps: userspace-prep
        $(call RPM_TO_USERSPACE,*libpam.so*,$(RPM_DIR)/pam)
        $(call RPM_TO_USERSPACE,*libfipscheck.so*,$(RPM_DIR)/fipscheck-lib)
        $(call RPM_TO_USERSPACE,*libnss3.so*,$(RPM_DIR)/nss)
@@ -723,14 +724,14 @@ hwloc-install:
        fi
 
 .PHONY:        irqbalance-install
-irqbalance-install:
+irqbalance-install: userspace-prep
        if ! [ -e irqbalance/config.h ]; then (cd irqbalance; ./autogen.sh;./configure --prefix=/usr); fi
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C irqbalance
 
        $(INSTALL_PROG)   irqbalance/irqbalance     userspace/usr/sbin/
 
 .PHONY:        pm-utils-install
-pm-utils-install:
+pm-utils-install: userspace-prep
        if ! [ -e pm-utils/config.h ]; then (cd pm-utils; ./autogen.sh;./configure --prefix=/usr); fi
        if ! [ -e pm-utils/src/service ]; then touch pm-utils/src/service; fi
        if [ -e $(CURDIR)/userspace/usr/share/man/man8/pm-suspend.8 ]; then rm -f $(CURDIR)/userspace/usr/share/man/man8/pm-*; fi
@@ -739,21 +740,21 @@ pm-utils-install:
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C pm-utils DESTDIR=$(CURDIR)/userspace install
 
 .PHONY:        cpufrequtils-install
-cpufrequtils-install:
+cpufrequtils-install: userspace-prep
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C cpufrequtils
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C cpufrequtils DESTDIR=$(CURDIR)/userspace install
 ifeq ($(RPM_ARCH), x86_64)
        (cd userspace/usr/$(LIBSDIR); ln -fs  ../lib/libcpufreq.so.0)
 endif
 .PHONY:        kexec-tools-install
-kexec-tools-install:
+kexec-tools-install: userspace-prep
        if ! [ -e kexec-tools/include/config.h ]; then (cd kexec-tools; ./bootstrap;./configure --prefix=/usr); fi
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C kexec-tools
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C kexec-tools prefix=$(CURDIR)/userspace install
 
 
 .PHONY: iscsi-install
-iscsi-install:
+iscsi-install: userspace-prep
        $(call RPM_TO_USERSPACE,./sbin/iscsiadm,$(RPM_DIR)/iscsi-initiator-utils)
        $(call RPM_TO_USERSPACE,./sbin/iscsistart,$(RPM_DIR)/iscsi-initiator-utils)
        $(call RPM_TO_USERSPACE,./sbin/iscsid,$(RPM_DIR)/iscsi-initiator-utils)
@@ -765,7 +766,7 @@ bridge-utils-install: userspace-prep $(RPMs-repo-exists)
        $(call RPM_INSTALL,$(RPM_DIR)/bridge-utils)
 
 .PHONY:        python-deps
-python-deps:
+python-deps: userspace-prep
        @echo "Installing python deps"
 ifeq ($(RPM_ARCH), x86_64)
        mkdir -p userspace/usr/lib64
@@ -841,10 +842,10 @@ xen-4.2-depend:
        $(call RPM_TO_USERSPACE,*libpixman*.so*,$(RPM_DIR)/pixman)
 
 .PHONY: power-depend
-power-depend:
+power-depend: userspace-prep
 
 .PHONY: perf-depend
-perf-depend:
+perf-depend: userspace-prep
        $(call RPM_TO_USERSPACE,*libelf*.so*,$(RPM_DIR)/elfutils-libelf)
        $(call RPM_TO_USERSPACE,*libdw*.so*,$(RPM_DIR)/elfutils-libs)
        $(call RPM_TO_USERSPACE,*libnewt*.so*,$(RPM_DIR)/newt)
@@ -879,13 +880,13 @@ ifeq ($(RPM_ARCH), x86_64)
 endif
 
 .PHONY: xenalyze-install
-xenalyze-install:
+xenalyze-install: userspace-prep
        $(MAKE) -j$$(($(NCPUS) * 2)) -C xenalyze
        $(INSTALL_PROG)   xenalyze/xenalyze     userspace/usr/bin/
        $(INSTALL_PROG)   xenalyze/dump-raw     userspace/usr/bin/
 
 .PHONY: oprofile-install
-oprofile-install:
+oprofile-install: userspace-prep
        if ! [ -e oprofile/config.h ]; then (cd oprofile; ./autogen.sh;./configure --prefix=/usr --with-kernel-support --with-linux=$(LINUX_DST) --enable-gui=no); fi
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C oprofile
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C oprofile prefix=$(CURDIR)/userspace install
@@ -960,7 +961,7 @@ endif
        fi
 
 .PHONY: nfs-install
-nfs-install:
+nfs-install: userspace-prep
        $(call RPM_TO_USERSPACE,*libgssglue*,$(RPM_DIR)/libgssglue)
        $(call RPM_TO_USERSPACE,*libtirpc*,$(RPM_DIR)/libtirpc)
        $(call RPM_TO_USERSPACE,*netconfig*,$(RPM_DIR)/libtirpc)
@@ -986,12 +987,12 @@ busybox/.config:  busybox.config
        $(MAKE) -j$$(($(NCPUS) * 2)) -C busybox oldconfig
 
 .PHONY: xtt-tools-install-fb
-xtt-tools-install-fb: directfb-install
+xtt-tools-install-fb: userspace-prep directfb-install
        LDLIBS="-L$(shell pwd)/userspace/$(LIBSDIR)" $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) -C tools/drfb_test
        $(INSTALL_PROG)   tools/drfb_test/dfbtest_fillrect     userspace/usr/bin/
 
 .PHONY: xtt-tools-install-eatmem
-xtt-tools-install-eatmem:
+xtt-tools-install-eatmem: userspace-prep
        LDLIBS="-L$(shell pwd)/userspace/$(LIBSDIR)" $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) -C tools/eatmem
        $(call RPM_TO_USERSPACE,./sbin/mkswap,$(RPM_DIR)/util-linux-ng)
        $(call RPM_TO_USERSPACE,./sbin/swapon,$(RPM_DIR)/util-linux-ng)
@@ -1016,13 +1017,14 @@ fio/fio: fio/fio
        $(MAKE) -j$$(($(NCPUS) * 2)) -C fio
 
 .PHONY: fio-install
-fio-install: fio/fio
+fio-install: userspace-prep fio/fio
        $(call RPM_TO_USERSPACE,*libaio*,$(RPM_DIR)/libaio)
+       $(MAKE) -j$$(($(NCPUS) * 2)) -C fio
        $(INSTALL_PROG)   fio/fio     userspace/usr/bin/
        cp fio/examples/*       userspace/root
 
 .PHONY: qemu-install
-qemu-install:
+qemu-install: userspace-prep
        if [ -e qemu/configure ]; then \
                if ! [ -e qemu/config.h ]; then \
                                (cd qemu;./configure --enable-vhost-net --enable-kvm --disable-xen \
@@ -1037,7 +1039,7 @@ qemu-install:
        $(MAKE) -C qemu DESTDIR=$(shell pwd)/userspace/ install
 
 .PHONY:        libraw1394-install
-libraw1394-install:
+libraw1394-install: userspace-prep
        if ! [ -e libraw1394/config.h ]; then (cd libraw1394; ./autogen.sh;./configure --prefix=/usr); fi
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C libraw1394
        $(MAKE) $(MFLAGS) -j$$(($(NCPUS) * 2)) -C libraw1394 DESTDIR=$(CURDIR)/userspace install
@@ -1073,8 +1075,9 @@ $(USERSPACE_INSTALL): userspace-prep $(LINUX_SRC)
 
 USERSPACE_DIRS = bin/ \
                 sbin/ \
-                usr/ usr/bin/ usr/sbin/  \
-                proc/ sys/ \
+                usr/ usr/bin/ usr/sbin/  usr/share usr/doc usr/lib usr/lib64 \
+                 lib/ lib64 / \
+                proc/ sys/ root/ \
                 etc/ \
                 etc/sysconfig \
                 $(LIBSDIR)/ usr/$(LIBSDIR)/