Author: justin
Date: 2006-07-12 03:27:52 -0600 (Wed, 12 Jul 2006)
New Revision: 1610

Added:
   branches/cross/packages/elftoaout/
   branches/cross/packages/silo/
Modified:
   branches/cross/packages/elftoaout/Makefile
   branches/cross/packages/silo/Makefile
   branches/cross/packages/udev/Makefile
   branches/cross/packages/vim/Makefile
Log:
Added elftoaout and silo for sparc64, upgraded vim to 7.0, udev to 093.

Copied: branches/cross/packages/elftoaout (from rev 1598, 
branches/cross/packages/device-mapper)

Modified: branches/cross/packages/elftoaout/Makefile
===================================================================
--- branches/cross/packages/device-mapper/Makefile      2006-07-11 13:57:00 UTC 
(rev 1598)
+++ branches/cross/packages/elftoaout/Makefile  2006-07-12 09:27:52 UTC (rev 
1610)
@@ -1,13 +1,17 @@
-# device-mapper Makefile
+# elftoaout Makefile
 
-NM= device-mapper
-VRS= 1.01.05
+NM= elftoaout
+VRS= 2.3
 DIR= $(NM).$(VRS)
 
 FILE= $(DIR).tgz
-URL-$(FILE)= ftp://sources.redhat.com/pub/dm/$(FILE)
-SHA-$(FILE)= 8b28c277ceb11f8a78f5e91b95036f5a563c7fa9
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= e47d5016de1e62a21f35f091c8c598a50b547243
 
+PATCH1= $(DIR)-64bit_fixes-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 73cfaed296adb33bdb80a3ca056fcb50c6e112cf
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -18,12 +22,12 @@
 
 stage2: Makefile $(FILE)
        $(std_build)
+       cp $(SRC)/$(FILE),$(PATCH1)} $(LFSSRC)
 
 compile-stage2:
-       ./configure --prefix=/usr
-       make $(PM)
+       patch -Np1 -i ../$(PATCH1)
+       make $(PM) CC="gcc $(64FLAGS)"
        make install
-       install -m644 lib/ioctl/libdevmapper.a /usr/lib
 
 clean:
        -rm -rf $(DIR)

Copied: branches/cross/packages/silo (from rev 1598, 
branches/cross/packages/device-mapper)

Modified: branches/cross/packages/silo/Makefile
===================================================================
--- branches/cross/packages/device-mapper/Makefile      2006-07-11 13:57:00 UTC 
(rev 1598)
+++ branches/cross/packages/silo/Makefile       2006-07-12 09:27:52 UTC (rev 
1610)
@@ -1,13 +1,17 @@
-# device-mapper Makefile
+# silo Makefile
 
-NM= device-mapper
-VRS= 1.01.05
+NM= silo
+VRS= 1.4.11
 DIR= $(NM).$(VRS)
 
-FILE= $(DIR).tgz
-URL-$(FILE)= ftp://sources.redhat.com/pub/dm/$(FILE)
-SHA-$(FILE)= 8b28c277ceb11f8a78f5e91b95036f5a563c7fa9
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= fee80586e2d027ba1c7ea4b40ad5d909b5a9f064
 
+PATCH1= $(DIR)-fixes-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 12e691866be9bacfd76b14ec6810db129d5121c2
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,14 +20,14 @@
        chroot "$(MP)" $(chenv-blfs) \
        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
        $(std_build)
+       cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)/
 
 compile-stage2:
-       ./configure --prefix=/usr
+       patch -Np1 -i ../$(PATCH1)
        make $(PM)
        make install
-       install -m644 lib/ioctl/libdevmapper.a /usr/lib
 
 clean:
        -rm -rf $(DIR)

Modified: branches/cross/packages/udev/Makefile
===================================================================
--- branches/cross/packages/udev/Makefile       2006-07-12 09:12:34 UTC (rev 
1609)
+++ branches/cross/packages/udev/Makefile       2006-07-12 09:27:52 UTC (rev 
1610)
@@ -1,19 +1,13 @@
 # Udev Makefile
 
 NM= udev
-VRS= 091
-CONFVRS= 20060502-try2
+VRS= 093
 DIR= $(NM)-$(VRS)
-CONFDIR=$(NM)-config-$(CONFVRS)
 
 FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.kernel.org/pub/linux/utils/kernel/hotplug/$(FILE)
-SHA-$(FILE)= d6c9ad0fd86df80f5e6228ce529de1a2c1427a85
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= 7baa5088602765a22c4417bbafd6730365cd1653
 
-CONFIG1= $(CONFDIR).tar.bz2
-URL-$(CONFIG1)= http://downloads.linuxfromscratch.org/$(CONFIG1)
-SHA-$(CONFIG1)= 55690045db2d3cf70f5e46e11846494b6ccd33dc
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -22,38 +16,21 @@
        chroot "$(MP)" $(chenv-post-bash) \
        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(CONFIG1)
+stage2: Makefile $(FILE)
        $(std_build)
-       cp $(SRC)/{$(FILE),$(CONFIG1)} $(LFSSRC)
+       cp $(SRC)/$(FILE) $(LFSSRC)
 
 compile-stage2:
-       tar xf ../$(CONFIG1)
-       install -dv /lib/{firmware,udev/devices/{pts,shm}}
-       mknod -m0666 /lib/udev/devices/null c 1 3
-       ln -sfv /proc/self/fd /lib/udev/devices/fd
-       ln -sfv /proc/self/fd/0 /lib/udev/devices/stdin
-       ln -sfv /proc/self/fd/1 /lib/udev/devices/stdout
-       ln -sfv /proc/self/fd/2 /lib/udev/devices/stderr
-       ln -sfv /proc/kcore /lib/udev/devices/core
-       rm -rf extras/dasd_id
-ifndef CROSS
-       make EXTRAS="`echo extras/*/`"
-else
-       make CC="gcc $(64FLAGS)" LD="gcc $(64FLAGS)" \
-        EXTRAS="`echo extras/*/`"
-endif
-       make DESTDIR=/ EXTRAS="`echo extras/*/`" install
-       cp $(CONFDIR)/[0-9]* /etc/udev/rules.d/
-       install -v -m 744 $(CONFDIR)/write_cd_aliases /lib/udev/
-       echo 'ACTION=="add", BUS=="pci", SYSFS{class}=="0x030000", 
RUN+="detect-video"' >/etc/udev/rules.d/30-video.rules
-       install -m755 ../detect-video /lib/udev
-       install -m644 ../50-network.rules /etc/udev/rules.d/
-       install -m644 -D docs/writing_udev_rules/index.html \
-        /usr/share/doc/$(DIR)/index.html
-       # Debug, remove before release
-       gcc -o bug ../bug.c
-       install -m755 bug /lib/udev
-       # End of debug
+       make EXTRAS="extras/floppy extras/cdrom_id extras/firmware \
+        extras/scsi_id extras/volume_id extras/ata_id extras/usb_id \
+        extras/edd_id extras/dasd_id extras/path_id" udevdir=/dev
+       make DESTDIR=/ EXTRAS="extras/floppy extras/cdrom_id extras/firmware \
+        extras/scsi_id extras/volume_id extras/ata_id extras/usb_id \
+        extras/edd_id extras/dasd_id extras/path_id" udevdir=/dev install
+       install -v extras/eventrecorder.sh /lib/udev
+       install -v -m644 -D docs/writing_udev_rules/index.html \
+        /usr/share/doc/udev-093/index.html
+       install -dv /lib/firmware
 
 clean:
        -rm -rf $(DIR)

Modified: branches/cross/packages/vim/Makefile
===================================================================
--- branches/cross/packages/vim/Makefile        2006-07-12 09:12:34 UTC (rev 
1609)
+++ branches/cross/packages/vim/Makefile        2006-07-12 09:27:52 UTC (rev 
1610)
@@ -1,17 +1,21 @@
 # Vim Makefile
 
 NM= vim
-VRS= 6.4
-DIR= $(NM)64
+VRS= 7.0
+DIR= $(NM)70
 
 FILE= $(NM)-$(VRS).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 4ecc16d704b303db25c52c6bc33ab65e661ace93
+SHA-$(FILE)= 38ef48cabf942d0dc804a794dcc6f002b9457fc8
 
 FILE2= $(NM)-$(VRS)-lang.tar.gz
 URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2)
-SHA-$(FILE2)= 4b80d0f2a0643ab942a9297b88a5447f654e998e
+SHA-$(FILE2)= 3db6b0004d213490cc00d361835e7a7c685adb52
 
+PATCH1= $(NM)-$(VRS)-fixes-5.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= 15ecd0dbfff4d4b221baca8f8a7c7bb841598a25
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -24,25 +28,18 @@
        chroot "$(MP)" $(chenv-blfs) \
        'cd $(ROOT) && make chroot-gvim $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(FILE2)
+stage2: Makefile $(FILE) $(FILE2) $(PATCH1)
        $(std_build)
-       cp $(SRC)/{$(FILE),$(FILE2)} $(LFSSRC)
+       cp $(SRC)/{$(FILE),$(FILE2),$(PATCH1)} $(LFSSRC)
 
 compile-stage2:
+       patch -Np1 -i ../$(PATCH1)
        unpack ../$(FILE2) --strip-components=1
        echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
-ifndef CROSS
        ./configure --prefix=/usr --enable-multibyte
-else
-       CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
-        ./configure --prefix=/usr --enable-multibyte
-endif
        make $(PM)
        make install
-       rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk}
-       rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.*
        ln -sfv vim /usr/bin/vi
-       ln -sfv vim.1 /usr/share/man/man1/vi.1
        ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS)
        cp $(ROOT)/etc/vimrc /etc
 
@@ -50,16 +47,14 @@
        $(std_build)
 
 compile-stage3:
+       patch -Np1 -i ../$(PATCH1)
        unpack ../$(FILE2) --strip-components=1
        echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
        echo '#define SYS_GVIMRC_FILE "/etc/gvimrc"' >> src/feature.h
-       ./configure --prefix=/usr --with-features=huge
+       ./configure --prefix=/usr --enable-multibyte --with-features=huge
        make $(PM)
        make install
-       rm -f /usr/share/vim/$(DIR)/tutor/tutor.{gr,pl,ru,sk}
-       rm -f /usr/share/vim/$(DIR)/tutor/tutor.??.*
        ln -sfv vim /usr/bin/vi
-       ln -sfv vim.1 /usr/share/man/man1/vi.1
        ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS)
        cp $(ROOT)/etc/vimrc /etc
 

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to