Changeset 9

Timestamp:

04/14/10 16:18:46 (11 years ago)

Author:

dennis

Message:

parted:

• Moved parted from boel_binaries to initrd

initrd.rul:

• Move install commands after build, not at pre-install

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• initrd_source/initrd.rul (modified) (4 diffs)
• initrd_source/make.d/parted.rul (moved) (moved from trunk/make.d/parted.rul) (2 diffs)

trunk/Makefile

@@ -232 +232 @@
 include $(TOPDIR)/make.d/openssh.rul
 include $(TOPDIR)/make.d/openssl.rul
-include $(TOPDIR)/make.d/parted.rul
 include $(TOPDIR)/make.d/pdisk.rul
 include $(TOPDIR)/make.d/popt.rul

trunk/initrd_source/initrd.rul

@@ -75 +75 @@
 include $(INITRD_DIR)/make.d/bc.rul
 include $(INITRD_DIR)/make.d/e2fsprogs.rul
+include $(INITRD_DIR)/make.d/parted.rul
 
 PHONY += build_dir 
@@ -112 +113 @@
         cd $(INITRD_BUILD_DIR)/dev && mknod -m 660 zero c 1 5
 
-        install -m 755 --strip $(BC_BINARY)         $(INITRD_BUILD_DIR)/bin/
-        install -m 755 --strip $(MKE2FS_BINARY)     $(INITRD_BUILD_DIR)/sbin/
-        install -m 755 --strip $(TUNE2FS_BINARY)    $(INITRD_BUILD_DIR)/sbin/
-
         touch $@
 
@@ -139 +136 @@
                                                                 $(BC_DIR).build                 \
                                                                 $(MKE2FS_BINARY)                \
-                                                                $(TUNE2FS_BINARY)               
+                                                                $(TUNE2FS_BINARY)               \
+                                                                $(PARTED_BINARY)
                                                                 
 
@@ -175 +173 @@
         install -m 644 $(LSB_DIR)/init-functions $(INITRD_BUILD_DIR)/lib/lsb
 
+        # Install manually the binaries
+        install -m 755 --strip $(BC_BINARY)         $(INITRD_BUILD_DIR)/bin/
+        install -m 755 --strip $(MKE2FS_BINARY)     $(INITRD_BUILD_DIR)/sbin/
+        install -m 755 --strip $(TUNE2FS_BINARY)    $(INITRD_BUILD_DIR)/sbin/
+        install -m 755 --strip $(PARTED_BINARY)     $(INITRD_BUILD_DIR)/sbin/
+
         # Copy over text files from the skel directory.
         cp -a $(INITRD_DIR)/skel/* $(INITRD_BUILD_DIR)

trunk/initrd_source/make.d/parted.rul

@@ -7 +7 @@
 #
 
-PARTED_VERSION := 1.6.25.1
+PARTED_VERSION := 2.2
 PARTED_DIR := parted-$(PARTED_VERSION)
 PARTED_TARBALL := parted-$(PARTED_VERSION).tar.gz
-#PARTED_URL := http://ftp.gnu.org/gnu/parted/$(PARTED_TARBALL)
-PARTED_URL := http://download.systemimager.org/pub/parted/$(PARTED_TARBALL)
-PARTED_BINARY := $(SRC_DIR)/$(PARTED_DIR)/parted/.libs/parted
-PARTED_PATCHES := $(shell ls $(PATCH_DIR)/parted.*.patch 2>/dev/null | sort)
+PARTED_URL := http://ftp.gnu.org/gnu/parted/$(PARTED_TARBALL)
+#PARTED_URL := http://download.systemimager.org/pub/parted/$(PARTED_TARBALL)
+PARTED_BINARY := $(INITRD_SRC_DIR)/$(PARTED_DIR)/parted/.libs/parted
 
-ALL_SOURCE += $(SRC_DIR)/$(PARTED_TARBALL)
+## Disabled
+#PARTED_PATCHES := $(shell ls $(PATCH_DIR)/parted.*.patch 2>/dev/null | sort)
+
+ALL_SOURCE += $(INITRD_SRC_DIR)/$(PARTED_TARBALL)
 
 ifdef IS_PPC64
@@ -24 +26 @@
 parted: $(PARTED_BINARY)
 
-$(PARTED_BINARY):       $(SRC_DIR)/$(PARTED_TARBALL) $(PARTED_PATCHES)
-        rm -rf $(SRC_DIR)/$(PARTED_DIR)
-        cd $(SRC_DIR) && tar -xvzf $(PARTED_TARBALL)
-        cd $(SRC_DIR)/$(PARTED_DIR) && \
+$(PARTED_BINARY):       $(INITRD_SRC_DIR)/$(PARTED_TARBALL) $(PARTED_PATCHES)
+        rm -rf $(INITRD_SRC_DIR)/$(PARTED_DIR)
+        cd $(INITRD_SRC_DIR) && tar -xvzf $(PARTED_TARBALL)
+        cd $(INITRD_SRC_DIR)/$(PARTED_DIR) && \
           cat $(PARTED_PATCHES) < /dev/null | patch -p1
-        ( cd $(SRC_DIR)/$(PARTED_DIR) && \
-          CPPFLAGS=-I$(SRC_DIR)/$(E2FSPROGS_DIR)/lib CFLAGS=-I$(SRC_DIR)/$(E2FSPROGS_DIR)/lib LDFLAGS=-L$(SRC_DIR)/$(E2FSPROGS_DIR)/lib \
+        ( cd $(INITRD_SRC_DIR)/$(PARTED_DIR) && \
+          CPPFLAGS=-I$(INITRD_SRC_DIR)/$(E2FSPROGS_DIR)/lib CFLAGS=-I$(INITRD_SRC_DIR)/$(E2FSPROGS_DIR)/lib LDFLAGS=-L$(INITRD_SRC_DIR)/$(E2FSPROGS_DIR)/lib \
           ./configure --disable-Werror --prefix= $(PARTED_CONFIGURE))
-        $(MAKE) -j $(NCPUS) -C $(SRC_DIR)/$(PARTED_DIR)
+        $(MAKE) -j $(NCPUS) -C $(INITRD_SRC_DIR)/$(PARTED_DIR)
 
-$(SRC_DIR)/$(PARTED_TARBALL):
-        [ -d $(SRC_DIR) ] || mkdir -p $(SRC_DIR)
-        $(GETSOURCE) $(PARTED_URL) $(SRC_DIR)
+$(INITRD_SRC_DIR)/$(PARTED_TARBALL):
+        [ -d $(INITRD_SRC_DIR) ] || mkdir -p $(INITRD_SRC_DIR)
+        $(GETSOURCE) $(PARTED_URL) $(INITRD_SRC_DIR)
 
 PHONY += parted_clean
 parted_clean:
-        rm -rf $(SRC_DIR)/$(PARTED_DIR)
+        rm -rf $(INITRD_SRC_DIR)/$(PARTED_DIR)
 
 DEBIAN_STABLE_BUILD_DEPS += libreadline4-dev