r470 - x86/trunk/packages/kbd

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Mon Aug 1 15:44:40 PDT 2005


Author: thomasp
Date: 2005-08-01 16:44:39 -0600 (Mon, 01 Aug 2005)
New Revision: 470

Modified:
   x86/trunk/packages/kbd/Makefile
Log:
Updated kbd Makefile

Modified: x86/trunk/packages/kbd/Makefile
===================================================================
--- x86/trunk/packages/kbd/Makefile	2005-08-01 22:39:11 UTC (rev 469)
+++ x86/trunk/packages/kbd/Makefile	2005-08-01 22:44:39 UTC (rev 470)
@@ -1,40 +1,69 @@
 # Kbd Makefile
+#==============================================================================
 
-# Package versions
 NM= kbd
 VRS= 1.12
 DIR= $(NM)-$(VRS)
+
 FILE= $(DIR).tar.bz2
-URL= $(HTTP)/$(NM)/$(FILE)
-PATCH= $(DIR)-backspace-1.patch
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 65eaae4d98fca3f7ae7dfc9d9cb7c5a432c6475f
 
 BELARUSIAN_FILE= belarusian-0.3.tar.gz
-BELARUSIAN_URL= http://www.mova.org/bellinux/$(BELARUSIAN_FILE)
+URL-$(BELARUSIAN_FILE)= http://www.mova.org/bellinux/$(BELARUSIAN_FILE)
+SHA-$(BELARUSIAN_FILE)= c0026a915fff58cdc3b68bb57de4eec35a220c43
 
-# RULES
+PATCH1= $(DIR)-backspace-1.patch
+SHA-$(PATCH1)= 39e332e42d5145dfc47786dba5eff63cda91d0ba
 
-.PHONY:  clean stage2 chroot
+# Targets
+# =============================================================================
 
+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 $(BELARUSIAN_FILE) ] ; then $(WGET) $(BELARUSIAN_URL) ; fi
-	@if [ ! -f /bin/loadkeys ] ; then unpack $(SRC)/$(FILE) && \
-	 tar zxvf $(BELARUSIAN_FILE) && \
-	 zcat bellinux/console/keymaps/by2_win.kmap.gz >$(DIR)/data/keymaps/i386/qwerty/by2_win.map && \
-	 echo 'Correcting SOFT SIGN in by2_win keymap' && \
-	 sed -i -e 's/\(50 = 0x.\)A/\1C/' $(DIR)/data/keymaps/i386/qwerty/by2_win.map && \
-	 cd $(DIR) &&  patch -Np1 -i ../$(PATCH) && \
-	 ./configure && make -j3 && make install ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE) $(BELARUSIAN_FILE) $(PATCH1)
+	@$(std_build)
+	@cp $(SRC)/$(FILE) $(LFSSRC)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@cd .. ; unpack $(BELARUSIAN_FILE)
+	@zcat ../bellinux/console/keymaps/by2_win.kmap.gz > data/keymaps/i386/qwerty/by2_win.map
+	@sed -i -e 's/\(50 = 0x.\)A/\1C/' data/keymaps/i386/qwerty/by2_win.map
+	@patch -Np1 -i ../$(PATCH1)
+	@./configure >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+
 clean:
 	@-rm -rf $(DIR)
 	@-rm -rf bellinux
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list