r541 - in x86/trunk: . packages/hotplug packages/mdadm

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Wed Aug 3 04:58:11 PDT 2005


Author: jhuntwork
Date: 2005-08-03 05:58:10 -0600 (Wed, 03 Aug 2005)
New Revision: 541

Removed:
   x86/trunk/packages/mdadm/raidtools-1.00.3-gcc-3.3_fix-1.patch
Modified:
   x86/trunk/packages/hotplug/Makefile
   x86/trunk/todo-list
Log:
Updated hotplug Makefile and removed old raidtools patch

Modified: x86/trunk/packages/hotplug/Makefile
===================================================================
--- x86/trunk/packages/hotplug/Makefile	2005-08-03 04:15:28 UTC (rev 540)
+++ x86/trunk/packages/hotplug/Makefile	2005-08-03 11:58:10 UTC (rev 541)
@@ -1,41 +1,52 @@
 # Hotplug Makefile
+#==============================================================================
 
-# Package versions
 NM= hotplug
 VRS= 2004_09_23
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 2dd1be1337765600c66e48e5726a30a197a4f483
+
 PATCH1= $(DIR)-try_all_drivers-6.patch
-URL= $(HTTP)/$(NM)/$(FILE)
-URL1= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 2a51950b25066d5d2cc81683f59c89bf05358494
 
-# RULES
+# Targets
+# =============================================================================
 
-.PHONY:  clean stage2 chroot
+include $(ROOT)/scripts/functions
 
 chroot:
-	@chroot "$(MP)" $(chenv-post-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-post-bash) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
-	 mv $(FILE) $(SRC) ; fi
-	@if [ ! -f /sbin/hotplug ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH1) && \
-	 make install && \
-	 cp etc/hotplug/pnp.distmap /etc/hotplug && \
-	 rm -rf /etc/init.d && \
-	 rm -f /etc/hotplug/net.agent && \
-	 touch /var/log/hotplug/events && \
-	 echo eepro100 >>/etc/hotplug/blacklist && \
-	 echo 8139cp >>/etc/hotplug/blacklist && \
-	 mkdir /etc/hotplug.d/pci && \
-	 install -m755 ../detect-video.hotplug /etc/hotplug.d/pci && \
-	 mkdir -p /lib/firmware ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/$(FILE) $(LFSSRC)
 
+compile-stage2:
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
+	@make install >>../$(DIR)-$@.log 2>&1
+	@cp etc/hotplug/pnp.distmap /etc/hotplug
+	@rm -rf /etc/init.d
+	@rm -f /etc/hotplug/net.agent
+	@touch /var/log/hotplug/events
+	@echo eepro100 >>/etc/hotplug/blacklist
+	@echo 8139cp >>/etc/hotplug/blacklist
+	@mkdir /etc/hotplug.d/pci
+	@install -m755 ../detect-video.hotplug /etc/hotplug.d/pci
+	@mkdir -p /lib/firmware
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Deleted: x86/trunk/packages/mdadm/raidtools-1.00.3-gcc-3.3_fix-1.patch
===================================================================
--- x86/trunk/packages/mdadm/raidtools-1.00.3-gcc-3.3_fix-1.patch	2005-08-03 04:15:28 UTC (rev 540)
+++ x86/trunk/packages/mdadm/raidtools-1.00.3-gcc-3.3_fix-1.patch	2005-08-03 11:58:10 UTC (rev 541)
@@ -1,62 +0,0 @@
---- raidtools-1.00.3/mkraid.c~	2003-07-23 18:57:58.000000000 +0200
-+++ raidtools-1.00.3/mkraid.c	2003-07-23 18:56:59.000000000 +0200
-@@ -170,33 +170,32 @@
- 
-     if (old_force_flag && (func == mkraid)) {
- 	fprintf(stderr, 
--
--"
-- WARNING!
--
-- NOTE: if you are recovering a double-disk error or some other failure mode
-- that made your array unrunnable but data is still intact then it's strongly
-- recommended to use the lsraid utility and to read the lsraid HOWTO.
--
-- If your RAID array holds useful and not yet backed up data then --force
-- and the hot-add/hot-remove functionality should be used with extreme care!
-- If your /etc/raidtab file is not in sync with the real array configuration,
-- then --force might DESTROY ALL YOUR DATA. It's especially dangerous to use
-- -f if the array is in degraded mode.
--
-- If your /etc/raidtab file matches the real layout of on-disk data then
-- recreating the array will not hurt your data, but be aware of the risks
-- of doing this anyway: freshly created RAID1 and RAID5 arrays do a full
-- resync of their mirror/parity blocks, which, if the raidtab is incorrect,
-- the resync will wipe out data irrecoverably. Also, if your array is in
-- degraded mode then the raidtab must match the degraded config exactly,
-- otherwise you'll get the same kind of data destruction during resync.
-- (see the failed-disk raidtab option.) You have been warned!
--
-- [ If your array holds no data, or you have it all backed up, or if you
-- know precisely what you are doing and you still want to proceed then use
-- the --really-force (or -R) flag. ]
--");
-+"\n"
-+" WARNING!\n"
-+"\n"
-+" NOTE: if you are recovering a double-disk error or some other failure mode\n"
-+" that made your array unrunnable but data is still intact then it's strongly\n"
-+" recommended to use the lsraid utility and to read the lsraid HOWTO.\n"
-+"\n"
-+" If your RAID array holds useful and not yet backed up data then --force\n"
-+" and the hot-add/hot-remove functionality should be used with extreme care!\n"
-+" If your /etc/raidtab file is not in sync with the real array configuration,\n"
-+" then --force might DESTROY ALL YOUR DATA. It's especially dangerous to use\n"
-+" -f if the array is in degraded mode.\n"
-+"\n"
-+" If your /etc/raidtab file matches the real layout of on-disk data then\n"
-+" recreating the array will not hurt your data, but be aware of the risks\n"
-+" of doing this anyway: freshly created RAID1 and RAID5 arrays do a full\n"
-+" resync of their mirror/parity blocks, which, if the raidtab is incorrect,\n"
-+" the resync will wipe out data irrecoverably. Also, if your array is in\n"
-+" degraded mode then the raidtab must match the degraded config exactly,\n"
-+" otherwise you'll get the same kind of data destruction during resync.\n"
-+" (see the failed-disk raidtab option.) You have been warned!\n"
-+"\n"
-+" [ If your array holds no data, or you have it all backed up, or if you\n"
-+" know precisely what you are doing and you still want to proceed then use\n"
-+" the --really-force (or -R) flag. ]\n"
-+);
- 	return EXIT_FAILURE;
-     }
- 

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-03 04:15:28 UTC (rev 540)
+++ x86/trunk/todo-list	2005-08-03 11:58:10 UTC (rev 541)
@@ -1,4 +1,3 @@
-hotplug
 inputattach
 lfs-bootscripts
 procps




More information about the livecd mailing list