r641 - in x86/trunk: . packages packages/ctags

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Fri Sep 16 20:39:59 PDT 2005


Author: jhuntwork
Date: 2005-09-16 21:39:59 -0600 (Fri, 16 Sep 2005)
New Revision: 641

Added:
   x86/trunk/packages/ctags/
   x86/trunk/packages/ctags/Makefile
Modified:
   x86/trunk/Makefile
Log:
Removed klibc, isoinfo.
Added ctags.
Fixed error with calling [package]-only-ch targets.
Added info for creating isos in ppc.


Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-09-17 03:31:30 UTC (rev 640)
+++ x86/trunk/Makefile	2005-09-17 03:39:59 UTC (rev 641)
@@ -214,8 +214,11 @@
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
 	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn ch-mdadm ch-which \
 	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
-	ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
+	ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
 	ch-syslinux ch-nALFS-profile
+ifeq ($(ARCH),ppc)
+	@make ch-yaboot
+endif
 
 sparc-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano \
 	ch-joe ch-screen ch-curl ch-zip ch-unzip ch-lynx ch-libxml2 ch-expat \
@@ -253,7 +256,7 @@
 
 # The following takes the form 'make [package name]-only-ch'	
 %-only-ch: prep-chroot
-	make -C $(PKG)/$@ chroot
+	make -C $(PKG)/$* chroot
 	make unmount
 
 gvim: prep-chroot
@@ -389,9 +392,11 @@
 	@>$(MP)/var/log/wtmp
 	@>$(MP)/var/log/lastlog
 	@install -m644 etc/issue $(MP)/etc/issue
+ifeq ($(ARCH),x86)
 	@install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux
+	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
+endif
 	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
-	@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
 	@install -m644 doc/README $(MP)/root/README
 	@sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
 	@install -m600 root/.bashrc $(MP)/root/.bashrc
@@ -411,10 +416,21 @@
 	 mv .root.sqfs $@
 
 iso: prepiso $(MP)/iso/.root.sqfs
-	cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l -L -D -o \
+ifeq ($(ARCH),x86)
+	@cd $(MP)/iso ; $(MP)/usr/bin/mkisofs -R -l -L -D -o \
 	$(MKTREE)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \
 	-c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table \
 	-V "lfslivecd-$(VERSION)" ./
+endif
+ifeq ($(ARCH),ppc)
+	@cd $(MP) ; ./usr/bin/mkisofs -hfs -part \
+	-map $(MKTREE)/$(PKG)/yaboot/map.hfs -no-desktop \
+	-hfs-volid "lfslivecd-$(VERSION)" -V "lfslivecd-$(VERSION) \
+	-hfs-bless iso/boot -r -v -o $(MKTREE)/lfslivecd-$(VERSION).iso iso \
+	 >$(MKTREE)/iso.log 2>&1
+	@if ! grep -q "Blessing" $(MKTREE)/iso.log ; then \
+	 echo "Iso incorrectly made! Boot directory not blessed." ; fi
+endif
 
 # Targets to clean your tree. 
 #==============================================================================

Added: x86/trunk/packages/ctags/Makefile
===================================================================
--- x86/trunk/packages/ctags/Makefile	2005-09-17 03:31:30 UTC (rev 640)
+++ x86/trunk/packages/ctags/Makefile	2005-09-17 03:39:59 UTC (rev 641)
@@ -0,0 +1,56 @@
+# ctags Makefile
+#==============================================================================
+
+NM= ctags
+VRS= 5.5.4
+DIR= $(NM)-$(VRS)
+
+FILE= $(DIR).tar.gz
+URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/$(NM)/$(FILE)
+SHA-$(FILE)= 1f912ef66c44d5527ce44c447a13fc33188bf16e
+
+# Targets
+# =============================================================================
+
+include $(ROOT)/scripts/functions
+
+chroot:
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@./configure --prefix=/usr >../$(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)
+
+.PHONY: clean chroot compile-stage2




More information about the livecd mailing list