Author: alexander
Date: 2005-07-07 08:54:08 -0600 (Thu, 07 Jul 2005)
New Revision: 304
Added:
x86/branches/utf8/packages/redhat-patches/
x86/branches/utf8/packages/redhat-patches/Makefile
Modified:
x86/branches/utf8/Makefile
x86/branches/utf8/packages/coreutils/Makefile
Log:
Downloaded a big collection of RedHat patches.
Added three of them to coreutils.
Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile 2005-07-07 09:04:14 UTC (rev 303)
+++ x86/branches/utf8/Makefile 2005-07-07 14:54:08 UTC (rev 304)
@@ -36,6 +36,7 @@
export SRC := /sources
export PKG := packages
export MKTREE := $(MP)$(ROOT)
+export REDHAT := $(ROOT)/$(PKG)/redhat-patches/devel
export CFLAGS := -Os -s -march=i486
export CXXFLAGS := -Os -s -march=i486
export CHOST := i486-pc-linux-gnu
@@ -169,7 +170,7 @@
@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages
ch-glibc ch-re-adjust-toolchain \
- ch-binutils ch-gcc stop-here ch-coreutils ch-zlib ch-mktemp ch-iana-etc
ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
+ ch-binutils ch-gcc ch-redhat-patches ch-coreutils stop-here ch-zlib
ch-mktemp ch-iana-etc ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
ch-readline ch-vim ch-m4 ch-bison ch-less ch-groff ch-sed ch-flex
ch-gettext ch-inetutils \
ch-iproute2 ch-perl ch-texinfo ch-autoconf ch-automake ch-bash
@@ -383,6 +384,10 @@
make -C $(PKG)/$@ chroot
make unmount
+redhat-patches: prep-chroot
+ make -C $(PKG)/$@ chroot
+ make unmount
+
coreutils: prep-chroot
make -C $(PKG)/$@ chroot
make unmount
@@ -1022,6 +1027,9 @@
ch-gcc: popdev
make -C $(PKG)/gcc stage2
+ch-redhat-patches: popdev
+ make -C $(PKG)/redhat-patches stage2
+
ch-coreutils: popdev
make -C $(PKG)/coreutils stage2
Modified: x86/branches/utf8/packages/coreutils/Makefile
===================================================================
--- x86/branches/utf8/packages/coreutils/Makefile 2005-07-07 09:04:14 UTC
(rev 303)
+++ x86/branches/utf8/packages/coreutils/Makefile 2005-07-07 14:54:08 UTC
(rev 304)
@@ -7,6 +7,66 @@
FILE= $(DIR).tar.bz2
PATCH1= $(DIR)-uname-2.patch
PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch
+
+# Descriptions:
+# -i18n: fixes incorrect behaviour in multibyte locales, e.g. this
+# LSB testsuite failure for /usr/bin/join:
+# "When -t option is not specified, verify blank characters
+# according to the current locale are used as input field separators."
+# Has a very bad bug history, rejected upstream,
+# probably still buggy, but required for LSB.
+#
+# -dateseconds: official upstream bugfix. Without it,
+# date --date="14 Mar 2004 21:04 +0100"
+# outputs non-zero seconds.
+#
+# -overflow: without this, the de_DE.UTF-8 translation of "IDLE" overflows
+# a buffer in /usr/bin/who.
+#
+# Other available patches:
+# -jday, -zh_CN: are supposed to fix output of "ls -l" if TIME_STYLE=locale
+# in the corresponding locales.
+# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118958
+# Actually the patches don't work because glibc code is used
+# instead of the thing being patched.
+#
+# -langinfo: is supposed to fix the output of "LANG=something LC_CTIME=C date",
+# but in none of the locales provided by Glibc-2.3.4 the right hand of
+# the conditional statement is evaluated, i.e. DATE_FMT_LANGINFO()
+# always returns non-NULL. Thus, the patch is not needed.
+#
+# -sysinfo: we have -uname patch that does the same.
+#
+# -afs: allows to build for AFS without installing AFS.
+#
+# -allow_old_options: we set DEFAULT_POSIX2_VERSION for that.
+#
+# -brokentest: fixes broken configure test. Needs further investigation.
+#
+# -copy, -rmaccess, -stale-utmp: origin: upstream, purpose: unknown.
+#
+# -fchown: looks like security fix? Why not in the "upstream" section?
+#
+# -chown: changes defaults for symlink dereferencing, origin: upstream.
+#
+# -gcc4: looks like gcc4 fix
+#
+# -getgrouplist: allows "id" to list more than 32 groups?
+# Origin: Ulrich Drepper.
+#
+# -no-sign-extend: upstream fix for "hostid". RedHat Bugzilla #160078
+#
+# -paths: sets default PATH for /bin/su. Not needed because LFS uses /bin/su
+# from shadow.
+#
+# -printf-ll, -acl, -runcon, -runuser, -pam, -selinux, -dircolors, -timestyle:
+# Feature additions and random tweaks of defaults.
+
+RHPATCHES= \
+ coreutils-i18n.patch \
+ coreutils-dateseconds.patch \
+ coreutils-overflow.patch
+
URL= $(HTTP)/$(NM)/$(FILE)
URL1= $(HTTP)/$(NM)/$(PATCH1)
URL2= $(HTTP)/$(NM)/$(PATCH2)
@@ -42,6 +102,8 @@
mv $(PATCH2) $(SRC) ; fi
@if [ ! -f /bin/ls ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
patch -Np1 -i $(SRC)/$(PATCH1) && patch -Np1 -i $(SRC)/$(PATCH2) && \
+ for PATCH in $(RHPATCHES) ; do \
+ patch -Np1 -i $(REDHAT)/coreutils/$$PATCH ; done && \
DEFAULT_POSIX2_VERSION=199209 ./configure --prefix=/usr && \
make -j3 && make install && \
$(WD)/bin/mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
&& \
Added: x86/branches/utf8/packages/redhat-patches/Makefile
===================================================================
--- x86/branches/utf8/packages/redhat-patches/Makefile 2005-07-07 09:04:14 UTC
(rev 303)
+++ x86/branches/utf8/packages/redhat-patches/Makefile 2005-07-07 14:54:08 UTC
(rev 304)
@@ -0,0 +1,35 @@
+# redhat-patches Makefile
+
+# Package versions
+NM= cvs-core-devel
+VRS= 20050704
+DIR= devel
+FILE= $(NM)-$(VRS).tar.bz2
+
+# Originally from http://cvs.fedora.redhat.com/webfiles/
+URL= http://ftp.lfs-matrix.net/pub/lfs/lfs-packages/redhat-patches/$(FILE)
+
+# RULES
+
+.PHONY: chroot stage2 clean
+
+chroot:
+ @chroot "$(MP)" $(chenv1) 'cd $(ROOT) && make ch-$(NM) $(chbash1)'
+
+# This target is for building the package once we're already inside
+# the chroot environment.
+stage2:
+ @echo ""
+ @echo "=====> Unpacking RedHat patches in chroot"
+ @echo ""
+ @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+ @if [ ! -d devel/coreutils ] ; then unpack $(FILE) && \
+ find $(DIR) ! -iname \*.patch -a -type f | xargs rm && \
+ find $(DIR) -empty | xargs rm -rf && \
+ find $(DIR) -empty | xargs rm -rf && \
+ find $(DIR) -empty | xargs rm -rf ; fi
+
+
+# Does what it says
+clean:
+ @-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
