Author: justin
Date: 2005-09-25 11:10:34 -0600 (Sun, 25 Sep 2005)
New Revision: 773
Added:
x86/trunk/packages/isoinfo/isoinfo-0.03.02-fixes-1.patch
Removed:
x86/trunk/packages/klibc/
x86/trunk/packages/sharutils/
Modified:
x86/trunk/Makefile
x86/trunk/initramfs/Makefile
x86/trunk/linux/config.x86
x86/trunk/packages/isoinfo/Makefile
Log:
Removed sharutils and klibc, moved isoinfo patch to isoinfo directory, removed
klibc from sparc-blfs, updated logging/messages for intramfs/Makefile and make
oldconfig-ed config.x86.
Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile 2005-09-25 16:00:12 UTC (rev 772)
+++ x86/trunk/Makefile 2005-09-25 17:10:34 UTC (rev 773)
@@ -217,7 +217,7 @@
ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
ch-syslinux ch-nALFS-profile
ifeq ($(ARCH),ppc)
- @make ch-yaboot
+ make ch-yaboot
endif
sparc-blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano \
@@ -229,7 +229,7 @@
ch-device-mapper ch-LVM2 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-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
wget-list:
@>wget-list ; \
Modified: x86/trunk/initramfs/Makefile
===================================================================
--- x86/trunk/initramfs/Makefile 2005-09-25 16:00:12 UTC (rev 772)
+++ x86/trunk/initramfs/Makefile 2005-09-25 17:10:34 UTC (rev 773)
@@ -1,5 +1,4 @@
# Makefile for initramfs included on the LFS livecd
-#==============================================================================
NM= initramfs
VRS= 1
@@ -9,62 +8,53 @@
WDIR= temp
# Targets
-# =============================================================================
include $(ROOT)/scripts/functions
chroot:
- @chroot "$(MP)" $(chenv-blfs) \
+ chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile
- @make compile-$@
+ make compile-$@
compile-stage2: init
- @$(call echo_message, Building)
-#==============================================================================
-# Building commands below \/
-#==============================================================================
- @mkdir -p $(WDIR)/{dev,bin,.tmpfs,.union}
- @$(CP) init $(WDIR)/
- @$(MK) -m 640 $(WDIR)/dev/console c 5 1
- @$(MK) -m 660 $(WDIR)/dev/hda b 3 0
- @$(MK) -m 660 $(WDIR)/dev/hdb b 3 64
- @$(MK) -m 660 $(WDIR)/dev/hdc b 22 0
- @$(MK) -m 660 $(WDIR)/dev/hdd b 22 64
- @$(MK) -m 660 $(WDIR)/dev/hde b 33 0
- @$(MK) -m 660 $(WDIR)/dev/hdf b 33 64
- @$(MK) -m 660 $(WDIR)/dev/hdg b 34 0
- @$(MK) -m 660 $(WDIR)/dev/hdh b 34 64
- @$(MK) -m 664 $(WDIR)/dev/null c 1 3
- @$(MK) -m 660 $(WDIR)/dev/sr0 b 11 0
- @$(MK) -m 660 $(WDIR)/dev/sr1 b 11 1
- @$(MK) -m 660 $(WDIR)/dev/sr2 b 11 2
- @$(MK) -m 660 $(WDIR)/dev/sr3 b 11 3
- @$(MK) -m 660 $(WDIR)/dev/sr4 b 11 4
- @$(MK) -m 660 $(WDIR)/dev/sr5 b 11 5
- @$(MK) -m 660 $(WDIR)/dev/sr6 b 11 6
- @$(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
- @$(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
- @cd $(WDIR); find . | cpio -o -H newc | gzip -9 >
../initramfs_data.cpio.gz
+ mkdir -p $(WDIR)/{dev,bin,.tmpfs,.union}
+ $(CP) init $(WDIR)/
+ $(MK) -m 640 $(WDIR)/dev/console c 5 1
+ $(MK) -m 660 $(WDIR)/dev/hda b 3 0
+ $(MK) -m 660 $(WDIR)/dev/hdb b 3 64
+ $(MK) -m 660 $(WDIR)/dev/hdc b 22 0
+ $(MK) -m 660 $(WDIR)/dev/hdd b 22 64
+ $(MK) -m 660 $(WDIR)/dev/hde b 33 0
+ $(MK) -m 660 $(WDIR)/dev/hdf b 33 64
+ $(MK) -m 660 $(WDIR)/dev/hdg b 34 0
+ $(MK) -m 660 $(WDIR)/dev/hdh b 34 64
+ $(MK) -m 664 $(WDIR)/dev/null c 1 3
+ $(MK) -m 660 $(WDIR)/dev/sr0 b 11 0
+ $(MK) -m 660 $(WDIR)/dev/sr1 b 11 1
+ $(MK) -m 660 $(WDIR)/dev/sr2 b 11 2
+ $(MK) -m 660 $(WDIR)/dev/sr3 b 11 3
+ $(MK) -m 660 $(WDIR)/dev/sr4 b 11 4
+ $(MK) -m 660 $(WDIR)/dev/sr5 b 11 5
+ $(MK) -m 660 $(WDIR)/dev/sr6 b 11 6
+ $(MK) -m 660 $(WDIR)/dev/sr7 b 11 7
+ $(MK) -m 660 $(WDIR)/dev/loop0 b 7 0
+ cd $(WDIR); find . | cpio -o -H newc | gzip -9 >
../initramfs_data.cpio.gz
ifeq ($(ARCH),x86)
- @$(CP) initramfs_data.cpio.gz /boot/isolinux/initramfs_data_cpio.gz
+ $(CP) initramfs_data.cpio.gz /boot/isolinux/initramfs_data_cpio.gz
else
- @$(CP) initramfs_data.cpio.gz /boot/
+ $(CP) initramfs_data.cpio.gz /boot/
endif
- @rm -rf temp
-#
-#==Status Messages==========================================
-#
- @$(OK)
+ rm -rf temp
init:
sed -i '/VOLUME_ID/s@".*"@"$(VERSION)"@' init.h
gcc [EMAIL PROTECTED] -o $@ -static -Os -s -Wall
clean:
- @-rm -rf temp
- @-rm -f initramfs_data*
- @-rm -f init
+ -rm -rf temp
+ -rm -f initramfs_data*
+ -rm -f init
.PHONY: clean chroot compile-stage2
Modified: x86/trunk/linux/config.x86
===================================================================
--- x86/trunk/linux/config.x86 2005-09-25 16:00:12 UTC (rev 772)
+++ x86/trunk/linux/config.x86 2005-09-25 17:10:34 UTC (rev 773)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12.3
-# Tue Aug 2 22:45:50 2005
+# Linux kernel version: 2.6.12.5
+# Sun Sep 25 00:38:51 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -49,7 +49,7 @@
CONFIG_CC_ALIGN_LOOPS=0
CONFIG_CC_ALIGN_JUMPS=0
# CONFIG_TINY_SHMEM is not set
-# CONFIG_BASE_SMALL is not set
+CONFIG_BASE_SMALL=0
#
# Loadable module support
@@ -1559,6 +1559,7 @@
# CONFIG_QNX4FS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
+CONFIG_UNION_FS=y
#
# Network File Systems
Modified: x86/trunk/packages/isoinfo/Makefile
===================================================================
--- x86/trunk/packages/isoinfo/Makefile 2005-09-25 16:00:12 UTC (rev 772)
+++ x86/trunk/packages/isoinfo/Makefile 2005-09-25 17:10:34 UTC (rev 773)
@@ -8,6 +8,8 @@
URL-$(FILE)= ftp://metalab.unc.edu/pub/Linux/utils/disk-management/$(FILE)
SHA-$(FILE)= 64d4ac5b7a2fe2c1d1787fdb3202634343647d11
+PATCH1= $(DIR)-fixes-1.patch
+
# Targets
include $(ROOT)/scripts/functions
@@ -20,13 +22,11 @@
$(std_build)
compile-stage2:
- patch -Np1 -i ../../klibc/$(NM)-$(VRS)-fixes-1.patch
+ patch -Np1 -i ../$(PATCH1)
make CC="klcc -shared" -f Makefile.Linux isoinfo
install isoinfo /usr/lib/klibc/bin
clean:
-rm -rf $(DIR)
-klibc-isoinfo: stage2
-
.PHONY: clean chroot compile-stage2
Added: x86/trunk/packages/isoinfo/isoinfo-0.03.02-fixes-1.patch
===================================================================
--- x86/trunk/packages/isoinfo/isoinfo-0.03.02-fixes-1.patch 2005-09-25
16:00:12 UTC (rev 772)
+++ x86/trunk/packages/isoinfo/isoinfo-0.03.02-fixes-1.patch 2005-09-25
17:10:34 UTC (rev 773)
@@ -0,0 +1,57 @@
+diff -urN isoinfo-0.03.02/isoinfo.c isoinfo-0.03.02.fixed/isoinfo.c
+--- isoinfo-0.03.02/isoinfo.c 2002-10-13 03:28:17.000000000 +0600
++++ isoinfo-0.03.02.fixed/isoinfo.c 2005-04-22 13:31:33.000000000 +0600
+@@ -103,7 +103,7 @@
+ iso_str( char* p, int n ) {
+ static char string[256];
+ int i= 0;
+- while( i < n ) string[i]= p[i++];
++ while( i < n ) { string[i]= p[i]; i++;}
+ string[i--]= '\0';
+ while( string[i] == ' ' ) string[i--]= '\0';
+ return( string );
+@@ -340,7 +340,7 @@
+ if( in_fd != STDIN_FILENO ) {
+ if( (in_fd=open(in_fn,O_RDONLY)) == -1 ) {
+ fprintf( ERROR_CHANNEL, "%s: Cannot open `%s'. %s.\n",
+- pn, in_fn, sys_errlist[errno] );
++ pn, in_fn, strerror(errno) );
+ retval= RETVAL_ERROR; goto DIE_NOW;
+ }
+ }
+@@ -354,12 +354,12 @@
+ if( in_fd != STDIN_FILENO ) { /* we can lseek() */
+ if( lseek(in_fd,blk_to_read*ISO_BLOCK_SIZE,SEEK_SET) == -1 ) {
+ fprintf( ERROR_CHANNEL, "%s: Cannot lseek `%s'. %s.\n",
+- pn, in_fn, sys_errlist[errno] );
++ pn, in_fn, strerror(errno) );
+ retval= RETVAL_ERROR; goto DIE_NOW;
+ }
+ if( (nbr=my_read(in_fd,buf,ISO_BLOCK_SIZE)) == -1 ) {
+ fprintf( ERROR_CHANNEL, "%s: Cannot read block %ld of `%s'. %s.\n",
+- pn, blk, in_fn, sys_errlist[errno] );
++ pn, blk, in_fn, strerror(errno) );
+ retval= RETVAL_ERROR; goto DIE_NOW;
+ }
+ blk= blk_to_read;
+@@ -411,7 +411,7 @@
+
+ if( close(in_fd) == -1 ) {
+ fprintf( ERROR_CHANNEL, "%s: Cannot close `%s'. %s.\n",
+- pn, in_fn, sys_errlist[errno] );
++ pn, in_fn, strerror(errno) );
+ retval= RETVAL_ERROR; goto DIE_NOW;
+ }
+
+diff -urN isoinfo-0.03.02/isoinfo.h isoinfo-0.03.02.fixed/isoinfo.h
+--- isoinfo-0.03.02/isoinfo.h 2002-10-13 03:28:17.000000000 +0600
++++ isoinfo-0.03.02.fixed/isoinfo.h 2005-04-22 11:00:53.000000000 +0600
+@@ -5,7 +5,7 @@
+ #undef DEBUG
+
+ #include <stdio.h> /* printf() */
+-#include <getopt.h> /* getopt() */
++/*#include <getopt.h> */ /* getopt() */
+ #include <errno.h> /* error numbers */
+ #include <unistd.h> /* read(), write(), close(), STDIN_FILENO */
+ #include <sys/types.h> /* open() */
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
