Changeset 6

Timestamp:

04/14/10 15:36:11 (11 years ago)

Author:

bas

Message:

Ported bc from boel binaries to initrd

Location:

trunk

Files:

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

trunk/Makefile

@@ -219 +219 @@
 # abstracted out. Its much more robust to include *.rul... -dannf
 #
-include $(TOPDIR)/make.d/bc.rul
 include $(TOPDIR)/make.d/ctcs.rul
 include $(TOPDIR)/make.d/discover-data.rul

trunk/initrd_source/initrd.rul

@@ -70 +70 @@
 include $(INITRD_DIR)/make.d/sysvinit.rul
 include $(INITRD_DIR)/make.d/udev.rul
+
+## BOEL BINARIES
+#
+include $(INITRD_DIR)/make.d/bc.rul
 
 PHONY += build_dir 
@@ -126 +130 @@
                                                                 $(RSYNC_DIR).install            \
                                                                 $(BITTORRENT_DIR).install       \
-                                                                $(CX_FREEZE_BINARY)             
+                                                                $(CX_FREEZE_BINARY)             \
+                                                                $(BC_DIR).build
                                                                 
 

trunk/initrd_source/make.d/bc.rul

@@ -5 +5 @@
 
 BC_VERSION      := 1.06
-BC_DIR          := $(SRC_DIR)/bc-$(BC_VERSION)
+BC_DIR          := $(INITRD_SRC_DIR)/bc-$(BC_VERSION)
 BC_TARBALL      := bc-$(BC_VERSION).tar.gz
 BC_URL          := http://download.systemimager.org/pub/bc/$(BC_TARBALL)
 BC_BINARY       := $(BC_DIR)/bc/bc
 
-ALL_SOURCE += $(SRC_DIR)/$(BC_TARBALL)
+ALL_SOURCE += $(INITRD_SRC_DIR)/$(BC_TARBALL)
 
 
@@ -21 +21 @@
 
 
-$(BC_DIR).unpack:       $(TOPDIR)/make.d/bc.rul \
-                    $(SRC_DIR)/$(BC_TARBALL)
-        cd $(SRC_DIR) && tar -xvzf $(BC_TARBALL)
+$(BC_DIR).unpack:       $(INITRD_DIR)/make.d/bc.rul \
+                    $(INITRD_SRC_DIR)/$(BC_TARBALL)
+        cd $(INITRD_SRC_DIR) && tar -xvzf $(BC_TARBALL)
         touch $@
 
 
-$(SRC_DIR)/$(BC_TARBALL):
-        mkdir -p $(SRC_DIR)
-        $(GETSOURCE) $(BC_URL) $(SRC_DIR)
+$(INITRD_SRC_DIR)/$(BC_TARBALL):
+        mkdir -p $(INITRD_SRC_DIR)
+        $(GETSOURCE) $(BC_URL) $(INITRD_SRC_DIR)