From 9bc31e7797f8dbf8877a8617c31358ed1d54b88d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Sep 2013 20:14:19 +0000 Subject: [PATCH 01/16] prt-get: updated to 5.19 and aligned with upstream --- prt-get/.md5sum | 3 +-- prt-get/Pkgfile | 7 +++---- prt-get/prt-get.diff | 13 ------------- 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 prt-get/prt-get.diff diff --git a/prt-get/.md5sum b/prt-get/.md5sum index 9bbaa7a..36f7e9a 100644 --- a/prt-get/.md5sum +++ b/prt-get/.md5sum @@ -1,4 +1,3 @@ -d0abf2a28823f9527c36832d5cbb8257 prt-get-5.18.tar.gz +a37751f1627a4e0125c8ffadfa85be80 prt-get-5.19.tar.gz 4f6b710e4d2b18c70cfe5e4a593938b7 prt-get.aliases 19045beb7d1b510502922ff3541cf0f4 prt-get.conf -b4eeea27244550754219801bcf29c5e3 prt-get.diff diff --git a/prt-get/Pkgfile b/prt-get/Pkgfile index 321cd30..a687225 100644 --- a/prt-get/Pkgfile +++ b/prt-get/Pkgfile @@ -4,14 +4,13 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=prt-get -version=5.18 -release=3 +version=5.19 +release=2 source=(http://jw.smts.ch/files/crux/prt-get-$version.tar.gz - prt-get.conf prt-get.aliases prt-get.diff) + prt-get.conf prt-get.aliases) build() { cd ${name}-${version} - patch -p1 -i $SRC/$name.diff ./configure --build=$CHOST \ --host=$CTARGET \ diff --git a/prt-get/prt-get.diff b/prt-get/prt-get.diff deleted file mode 100644 index f5412df..0000000 --- a/prt-get/prt-get.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/installtransaction.cpp b/src/installtransaction.cpp -index 849931a..70e5e37 100644 ---- a/src/installtransaction.cpp -+++ b/src/installtransaction.cpp -@@ -658,5 +658,7 @@ string InstallTransaction::getPkgmkPackageDir() - - string InstallTransaction::getPkgmkCompressionMode() - { -- return getPkgmkSetting("PKGMK_COMPRESSION_MODE"); -+ string value = getPkgmkSetting("PKGMK_COMPRESSION_MODE"); -+ -+ return value.size() ? value : "gz"; - } -- 2.26.2 From 4dd869461efa9dd95f06756f8f99fd53631313f8 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Sep 2013 20:32:18 +0000 Subject: [PATCH 02/16] rc: updated to 2.28 and aligned with upstream --- rc/.md5sum | 4 ++-- rc/Pkgfile | 4 ++-- rc/inittab | 2 +- rc/rc.shutdown | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rc/.md5sum b/rc/.md5sum index 8a410a8..60987c3 100644 --- a/rc/.md5sum +++ b/rc/.md5sum @@ -1,9 +1,9 @@ -d2a8e98a8b10ba09b2a9da34326b526a inittab +49523b36db24792e3e70be2190f2e64a inittab 3858dfcab370c4e9b9d7356a1d3464a1 rc c8fe38143dffbbc628a7a33966fae408 rc.conf afe5cd67920474246ae74e54a9845339 rc.fix d1be35927946756c68242f29c16ee983 rc.local 394d5cff98ab59fd1a0ec64fe79292cb rc.modules a2d24525ca3ff1daf5753edcdf89466b rc.multi -d3a1e6e3edad489020fd56305bed8d6f rc.shutdown +a46c238c63564a289318b771f81e602d rc.shutdown d8d9bd102b0177a7bb30db9fd088a6e8 rc.single diff --git a/rc/Pkgfile b/rc/Pkgfile index e4098d8..eeb1d6e 100644 --- a/rc/Pkgfile +++ b/rc/Pkgfile @@ -4,8 +4,8 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=rc -version=2.26 -release=3 +version=2.28 +release=1 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf) build() { diff --git a/rc/inittab b/rc/inittab index ba613fd..067bc47 100644 --- a/rc/inittab +++ b/rc/inittab @@ -17,7 +17,7 @@ rm:2:wait:/etc/rc.multi rd:06:wait:/etc/rc.shutdown su:S:wait:/sbin/sulogin -p -c1:2:respawn:/sbin/agetty 38400 tty1 linux +c1:2:respawn:/sbin/agetty --noclear 38400 tty1 linux c2:2:respawn:/sbin/agetty 38400 tty2 linux c3:2:respawn:/sbin/agetty 38400 tty3 linux c4:2:respawn:/sbin/agetty 38400 tty4 linux diff --git a/rc/rc.shutdown b/rc/rc.shutdown index 790117e..63fbd43 100755 --- a/rc/rc.shutdown +++ b/rc/rc.shutdown @@ -43,14 +43,14 @@ fi /sbin/swapoff -a # Unmount file systems -/bin/umount -a -r -t nosysfs,noproc +/bin/umount -a -d -r -t nosysfs,noproc,nodevtmpfs if [ -x /sbin/lvm ]; then /sbin/vgchange --ignorelockingfailure -a n fi /bin/umount -a -r # Remount root filesystem read-only -/bin/mount -n -o remount,ro / +/bin/mount -o remount,ro / # Power off or reboot if [ "$RUNLEVEL" = "0" ]; then -- 2.26.2 From 47010c6391ef379423e432acd59b24a51afd685f Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Sep 2013 20:36:10 +0000 Subject: [PATCH 03/16] sed: updated to 4.2.2 --- sed/.md5sum | 2 +- sed/Pkgfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sed/.md5sum b/sed/.md5sum index 63b0bd1..7d91e5f 100644 --- a/sed/.md5sum +++ b/sed/.md5sum @@ -1 +1 @@ -7d310fbd76e01a01115075c1fd3f455a sed-4.2.1.tar.bz2 +7ffe1c7cdc3233e1e0c4b502df253974 sed-4.2.2.tar.bz2 diff --git a/sed/Pkgfile b/sed/Pkgfile index 6162e21..63c9663 100644 --- a/sed/Pkgfile +++ b/sed/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=sed -version=4.2.1 +version=4.2.2 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2) -- 2.26.2 From f93ac89b7406a1ebc5d097dd357fbec8af833234 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Sep 2013 21:28:45 +0000 Subject: [PATCH 04/16] tzdata: updated to 2012j --- tzdata/.md5sum | 6 ++-- tzdata/Pkgfile | 2 +- tzdata/tzcode-makefile.patch | 55 ++++++------------------------------ 3 files changed, 12 insertions(+), 51 deletions(-) diff --git a/tzdata/.md5sum b/tzdata/.md5sum index 389827b..f719d59 100644 --- a/tzdata/.md5sum +++ b/tzdata/.md5sum @@ -1,4 +1,4 @@ -1b9eebf5edda4c37b65d2a83ae6f02f5 tzcode-makefile.patch -edc0b55c4afbad7249ccacb3503e7f10 tzcode2012f.tar.gz -944ad681a8623336230dcdb306d5c9f6 tzdata2012f.tar.gz +051c7f462b3b9e3934572a5afd276d9a tzcode-makefile.patch +868b5d0dbf0e115ae4eb39a932ad0c4c tzcode2012j.tar.gz +ba2f92ae7ad099090e8f86cff2f2d799 tzdata2012j.tar.gz 0a1f00a575587eec635bbef60c62f6d9 zic_host-makefile.patch diff --git a/tzdata/Pkgfile b/tzdata/Pkgfile index de6f6c9..1fcb28d 100644 --- a/tzdata/Pkgfile +++ b/tzdata/Pkgfile @@ -4,7 +4,7 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=tzdata -version=2012f +version=2012j release=1 source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch index d123b96..683184d 100644 --- a/tzdata/tzcode-makefile.patch +++ b/tzdata/tzcode-makefile.patch @@ -1,8 +1,9 @@ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2012a-makefile.patch +# Patch reapplied and fixed for tzcode 2012i diff -Nru tzcode.orig/Makefile tzcode/Makefile ---- tzcode.orig/Makefile 2012-09-13 10:25:47.698561812 +0200 -+++ tzcode/Makefile 2012-09-13 10:31:12.070115537 +0200 +--- tzcode.orig/Makefile 2012-11-04 10:31:01.772733264 +0100 ++++ tzcode/Makefile 2012-11-04 10:31:16.358872807 +0100 @@ -39,17 +39,17 @@ # Everything gets put in subdirectories of. . . @@ -24,16 +25,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile # If you "make INSTALL", the "date" command gets installed in. . . -@@ -223,7 +223,7 @@ - ZIC= $(zic) $(ZFLAGS) - - # The name of a Posix-compliant `awk' on your system. --AWK= nawk -+AWK= awk - - # The path where SGML DTDs are kept. - # The default is appropriate for Ubuntu. -@@ -257,8 +257,10 @@ +@@ -274,8 +274,10 @@ ############################################################################### @@ -46,7 +38,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -298,13 +300,15 @@ +@@ -316,13 +318,15 @@ ALL: all date @@ -65,7 +57,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile -mkdir $(TOPDIR) $(MANDIR) \ $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 -rm -f $(MANDIR)/man3/newctime.3 \ -@@ -314,8 +318,6 @@ +@@ -332,8 +336,6 @@ $(MANDIR)/man8/zdump.8 \ $(MANDIR)/man8/zic.8 cp newctime.3 newtzset.3 $(MANDIR)/man3/. @@ -74,20 +66,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile INSTALL: ALL install date.1 -mkdir $(TOPDIR) $(BINDIR) -@@ -329,10 +331,10 @@ - 'static char const TZVERSION[]="tz$(VERSION)";' - - zdump: $(TZDOBJS) -- $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@ - - zic: $(TZCOBJS) yearistype -- $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@ - - yearistype: yearistype.sh - cp yearistype.sh yearistype -@@ -354,9 +356,9 @@ +@@ -372,9 +374,9 @@ # You must replace all of $(TZDIR) to switch from not using leap seconds # to using them, or vice versa. other_two: zic leapseconds $(TDATA) @@ -99,16 +78,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile posix_right: posix_only other_two -@@ -371,7 +373,7 @@ - then ranlib $@ ; fi - - date: $(DATEOBJS) -- $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \ -+ $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \ - $(LDLIBS) -lc -o $@ - - tzselect: tzselect.ksh -@@ -382,7 +384,7 @@ +@@ -400,7 +402,7 @@ <$? >$@ chmod +x $@ @@ -117,12 +87,3 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile check_tables: checktab.awk $(PRIMARY_YDATA) $(AWK) -f checktab.awk $(PRIMARY_YDATA) -diff -Nru tzcode.orig/tzselect.ksh tzcode/tzselect.ksh ---- tzcode.orig/tzselect.ksh 2012-09-13 10:25:47.698561812 +0200 -+++ tzcode/tzselect.ksh 2012-09-13 10:26:06.107893321 +0200 -@@ -1,4 +1,4 @@ --#! /bin/ksh -+#! /bin/bash - - TZVERSION=see_Makefile - -- 2.26.2 From c7236528a0f695cc0f9d4e94efe0b79c3b5417bd Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Sep 2013 21:44:35 +0000 Subject: [PATCH 05/16] unzip: aligned with upstream --- unzip/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unzip/Pkgfile b/unzip/Pkgfile index 205b11a..8c22194 100644 --- a/unzip/Pkgfile +++ b/unzip/Pkgfile @@ -6,7 +6,7 @@ name=unzip version=6.0 -release=1 +release=2 source=(http://downloads.sourceforge.net/sourceforge/infozip/${name}${version//./}.tar.gz) build() { -- 2.26.2 From 16689a211f9bb0e22a6bfe47ba8a7dc17bb86599 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Sep 2013 21:45:51 +0000 Subject: [PATCH 06/16] vim: updated to 7.3.754 and aligned with upstream --- vim/.md5sum | 2 ++ vim/Pkgfile | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/vim/.md5sum b/vim/.md5sum index 61d959c..c40670f 100644 --- a/vim/.md5sum +++ b/vim/.md5sum @@ -11,4 +11,6 @@ c640a1147b6824c902c56f0d512ac5d8 vim-7.3.261-303.xz bd739c11c478b7ee352467d6caed871d vim-7.3.471-515.xz a48bc97d01078fa6b396dc79f9916fa1 vim-7.3.516-600.xz c4608d5814f016a9d67fe2f13ab036fb vim-7.3.601-659.xz +9ffdd42550500b2a86f35c8191917c6f vim-7.3.660-712.xz +2af3bf40678d6616e1c2a093b750185c vim-7.3.713-754.xz 5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2 diff --git a/vim/Pkgfile b/vim/Pkgfile index 7707a51..6d1df10 100644 --- a/vim/Pkgfile +++ b/vim/Pkgfile @@ -2,10 +2,10 @@ # URL: http://www.vim.org/ # Maintainer: CRUX System Team, core-ports at crux dot nu # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu -# Depends on: ncurses +# Depends on: ncurses acl name=vim -version=7.3.154 +version=7.3.754 release=1 source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://crux.nu/files/distfiles/vim-7.3.001-050.xz @@ -20,6 +20,8 @@ source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2 http://crux.nu/files/distfiles/vim-7.3.471-515.xz http://crux.nu/files/distfiles/vim-7.3.516-600.xz http://crux.nu/files/distfiles/vim-7.3.601-659.xz + http://crux.nu/files/distfiles/vim-7.3.660-712.xz + http://crux.nu/files/distfiles/vim-7.3.713-754.xz vim-7.3-cross.diff) build () { -- 2.26.2 From c8a7de8ec63d281d0150b3b8f440eabf4e64fc27 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Tue, 10 Sep 2013 21:51:20 +0000 Subject: [PATCH 07/16] libcap: fixed header --- libcap/Pkgfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libcap/Pkgfile b/libcap/Pkgfile index ac9a266..bd68b1d 100644 --- a/libcap/Pkgfile +++ b/libcap/Pkgfile @@ -1,7 +1,8 @@ # Description: POSIX.1e capabilities library -# URL: http://sites.google.com/site/fullycapable/ -# Maintainer: CRUX System Team, core-ports at crux dot nu -# Depends on: attr +# URL: http://sites.google.com/site/fullycapable/ +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu +# Depends on: attr name=libcap version=2.22 -- 2.26.2 From da33f4fc12d9275f5cbe9f3968fdf29679c07782 Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Wed, 11 Sep 2013 10:16:22 +0000 Subject: [PATCH 08/16] coreutils: updated to 8.20 (fixes FS#50) - added new deps: acl, libcap - fix to avoid crosscompile make-prime-list - fix to avoid rebuild manpages --- coreutils/.md5sum | 3 +-- coreutils/Pkgfile | 37 ++++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/coreutils/.md5sum b/coreutils/.md5sum index bbc880d..f8bdcdf 100644 --- a/coreutils/.md5sum +++ b/coreutils/.md5sum @@ -1,3 +1,2 @@ -1a01231a2f3ed37c0efc073ccdda9375 coreutils-8.19.tar.xz -2ccdd9160da6f39bd226c0e3f3953304 coreutils-8.19_manpages.tar.xz +3d69af8f561fce512538a9fe85f147ff coreutils-8.20.tar.xz e14ef9dd59a7e6c7f3ae706771964d75 coreutils-uname.patch diff --git a/coreutils/Pkgfile b/coreutils/Pkgfile index a3dcd6a..2a519e0 100644 --- a/coreutils/Pkgfile +++ b/coreutils/Pkgfile @@ -2,19 +2,18 @@ # URL: http://www.gnu.org/software/coreutils/ # Maintainer: CRUX System Team, core-ports at crux dot nu # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu -# Depends on: libgmp +# Depends on: libgmp acl libcap name=coreutils -version=8.19 +version=8.20 release=1 -source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.xz - coreutils-uname.patch - http://crux-arm.nu/files/distfiles/coreutils-8.19_manpages.tar.xz) +source=(http://ftp.gnu.org/pub/gnu/$name/$name-$version.tar.xz \ + $name-uname.patch) build() { cd $name-$version - patch -p1 -i $SRC/coreutils-uname.patch - sed "s|SUBDIRS = lib src doc man po tests gnulib-tests|SUBDIRS = lib src tests gnulib-tests|g" -i Makefile.in + + patch -p1 -i $SRC/$name-uname.patch cat > config.cache < Date: Fri, 13 Sep 2013 19:50:02 +0000 Subject: [PATCH 09/16] libarchive: Fix libtool link with host libraries problem FS#51 --- libarchive/Pkgfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libarchive/Pkgfile b/libarchive/Pkgfile index 3572d48..64018e5 100644 --- a/libarchive/Pkgfile +++ b/libarchive/Pkgfile @@ -18,6 +18,10 @@ build() { # to libraries which are only available in opt. XML support is only # needed for the xar format which we can live without. + # Fix libtool linking with host forcing our library path + sed -e "s|-rpath \$(libdir)|-rpath $CLFS/usr/lib|g" \ + -e "s|\$(libarchive_la_LIBADD) \$(LIBS)|-L$CLFS/usr/lib|g" -i Makefile.in + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ @@ -26,6 +30,10 @@ build() { --without-xml2 \ --without-expat \ --without-openssl + + # Forcing libtool to prioritize our sysroot + sed "s|lt_sysroot=|lt_sysroot=$CLFS|g" -i libtool + make make DESTDIR=$PKG install } -- 2.26.2 From 2425423194b77b6b290af5aaf1384cb4319ac6da Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 13 Sep 2013 21:12:47 +0000 Subject: [PATCH 10/16] udev: aligned with upstream, added forgotten rules and fixed FS#52 using lt_sysroot to prioritize our CLFS --- udev/81-crux.rules | 6 ++++++ udev/Pkgfile | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 udev/81-crux.rules diff --git a/udev/81-crux.rules b/udev/81-crux.rules new file mode 100644 index 0000000..88d8bc9 --- /dev/null +++ b/udev/81-crux.rules @@ -0,0 +1,6 @@ +# +# 81-crux.rules +# + +KERNEL=="fuse", ACTION=="add", RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections" + diff --git a/udev/Pkgfile b/udev/Pkgfile index 3e8d0d4..2bad3e2 100644 --- a/udev/Pkgfile +++ b/udev/Pkgfile @@ -5,13 +5,16 @@ name=udev version=182 -release=1 +release=2 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.xz \ 81-crux.rules start_udev) build() { cd udev-$version + # Forcing libtool to prioritize our sysroot + sed "s|lt_sysroot=|lt_sysroot=$CLFS|g" -i m4/libtool.m4 + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ -- 2.26.2 From 7649a0ac3fa78b6dcf9f3cdafddacbbb23b6079c Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 13 Sep 2013 21:25:12 +0000 Subject: [PATCH 11/16] shadow: fixed FS#53 using lt_sysroot to prioritize our CLFS --- shadow/Pkgfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shadow/Pkgfile b/shadow/Pkgfile index d570a5e..3766631 100644 --- a/shadow/Pkgfile +++ b/shadow/Pkgfile @@ -15,6 +15,9 @@ build() { echo "ac_cv_func_setpgrp_void=yes" >> config.cache + # Fix first configure to point to the right place + sed "s|lt_sysroot=|lt_sysroot=$CLFS|g" -i aclocal.m4 + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ @@ -28,6 +31,9 @@ build() { --without-audit \ --cache-file=config.cache + # Forcing libtool to prioritize our sysroot + sed "s|lt_sysroot=|lt_sysroot=$CLFS|g" -i libtool + make make DESTDIR=$PKG install -- 2.26.2 From 16f246be03d15a5ce5707d0fa391e4cf153c67a9 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 Sep 2013 11:56:22 +0000 Subject: [PATCH 12/16] openssl: force one make job --- openssl/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openssl/Pkgfile b/openssl/Pkgfile index 7b1998f..1b6046f 100644 --- a/openssl/Pkgfile +++ b/openssl/Pkgfile @@ -14,7 +14,7 @@ build() { cd $name-$version ./Configure linux-generic32 --prefix=/usr --openssldir=/etc/ssl shared sed -i Makefile -e "s|-O3 -fomit-frame-pointer|$CFLAGS|" - make + make -j1 make INSTALL_PREFIX=$PKG LIBDIR=lib MANDIR=/usr/man MANSUFFIX=ssl install find $PKG -name "*fips*" -delete chmod -R +w $PKG -- 2.26.2 From 8d17300daa48d7e6d3ba3b209cdc46167e9d2304 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 Sep 2013 12:52:31 +0000 Subject: [PATCH 13/16] util-linux: aligned with upstream and fixed typo disabling sulogin --- util-linux/.footprint | 4 ---- util-linux/Pkgfile | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/util-linux/.footprint b/util-linux/.footprint index 1177cb3..829ee62 100644 --- a/util-linux/.footprint +++ b/util-linux/.footprint @@ -38,7 +38,6 @@ drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/pivot_root -rwxr-xr-x root/root sbin/raw -rwxr-xr-x root/root sbin/sfdisk --rwxr-xr-x root/root sbin/sulogin -rwxr-xr-x root/root sbin/swaplabel -rwxr-xr-x root/root sbin/swapoff -rwxr-xr-x root/root sbin/swapon @@ -87,7 +86,6 @@ lrwxrwxrwx root/root usr/bin/linux64 -> setarch -rwxr-xr-x root/root usr/bin/unshare -rwxr-xr-x root/root usr/bin/utmpdump -rwxr-xr-x root/root usr/bin/uuidgen --rwxr-sr-x root/tty usr/bin/wall -rwxr-xr-x root/root usr/bin/whereis -rwxr-sr-x root/tty usr/bin/write drwxr-xr-x root/root usr/include/ @@ -152,7 +150,6 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/unshare.1.gz -rw-r--r-- root/root usr/man/man1/utmpdump.1.gz -rw-r--r-- root/root usr/man/man1/uuidgen.1.gz --rw-r--r-- root/root usr/man/man1/wall.1.gz -rw-r--r-- root/root usr/man/man1/whereis.1.gz -rw-r--r-- root/root usr/man/man1/write.1.gz drwxr-xr-x root/root usr/man/man3/ @@ -207,7 +204,6 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/rtcwake.8.gz -rw-r--r-- root/root usr/man/man8/setarch.8.gz -rw-r--r-- root/root usr/man/man8/sfdisk.8.gz --rw-r--r-- root/root usr/man/man8/sulogin.8.gz -rw-r--r-- root/root usr/man/man8/swaplabel.8.gz -rw-r--r-- root/root usr/man/man8/swapoff.8.gz -rw-r--r-- root/root usr/man/man8/swapon.8.gz diff --git a/util-linux/Pkgfile b/util-linux/Pkgfile index 8290280..4434784 100644 --- a/util-linux/Pkgfile +++ b/util-linux/Pkgfile @@ -15,7 +15,8 @@ build() { --host=$CTARGET \ --prefix=/usr \ --mandir=/usr/man \ - --disable-{login,su,su} \ + --disable-{nls,wall} \ + --disable-{login,su,sulogin} \ --enable-{write,raw,kill} make -- 2.26.2 From 60f5b73fc423219b1e18d698328a1310be4da3a9 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 Sep 2013 15:37:20 +0000 Subject: [PATCH 14/16] gcc: fixed pkgversion --- gcc/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/Pkgfile b/gcc/Pkgfile index 7cdd4a2..a3003cf 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -40,7 +40,7 @@ build() { --disable-nls \ --with-x=no \ --with-system-zlib \ - --with-pkgversion="CRUX-ARMHF" + --with-pkgversion="CRUX-ARM" # prevent GCC from looking in the wrong directories for headers and libraries sed "/^HOST_\(GMP\|PPL\|CLOOG\)\(LIBS\|INC\)/s:-[IL]/\(lib\|include\)::" -i Makefile -- 2.26.2 From 3af3484580178e023b58820a34d33f964cd0decd Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 Sep 2013 21:38:46 +0000 Subject: [PATCH 15/16] gcc: fixed revision --- gcc/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/Pkgfile b/gcc/Pkgfile index a3003cf..702a016 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -16,7 +16,7 @@ build() { patch -p1 -i $SRC/$name-$version-gnueabihf.patch patch -p1 -i $SRC/$name-nocheck-fixincludes.patch - sed -i 's|REVISION|REVISION " (CRUX-ARMHF)"|' $name/version.c + sed -i 's|REVISION|REVISION " (CRUX-ARM)"|' $name/version.c # apply a sed substitutio that will suppress the installation of libiberty.a sed 's|install_to_$(INSTALL_DEST) ||' -i libiberty/Makefile.in -- 2.26.2 From a7ca82365d9f4ca4ef88a1f6bb22c9887c00f950 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 Sep 2013 21:39:18 +0000 Subject: [PATCH 16/16] pkgutils: fixed CFLAGS used --- pkgutils/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgutils/Pkgfile b/pkgutils/Pkgfile index 60662b8..a2b8e2d 100644 --- a/pkgutils/Pkgfile +++ b/pkgutils/Pkgfile @@ -12,5 +12,5 @@ source=(http://crux.nu/files/$name-$version.tar.gz) build () { cd $name-$version make DESTDIR=$PKG install - sed 's|FLAGS=.*|FLAGS="-O2 -pipe -mno-unaligned-access"|' -i $PKG/etc/pkgmk.conf + sed 's|FLAGS=.*|FLAGS="-O2 -pipe -mfloat-abi=hard"|' -i $PKG/etc/pkgmk.conf } -- 2.26.2