From 6251ec61ce00f03bd6c111098e043f89b45da4c4 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:43:17 +0000 Subject: [PATCH 01/16] psmisc: updated to 22.20 and aligned with upstream --- psmisc/.md5sum | 2 +- psmisc/Pkgfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/psmisc/.md5sum b/psmisc/.md5sum index d48bc14..12be186 100644 --- a/psmisc/.md5sum +++ b/psmisc/.md5sum @@ -1 +1 @@ -e2c339e6b65b730042084023784a729e psmisc-22.13.tar.gz +a25fc99a6dc7fa7ae6e4549be80b401f psmisc-22.20.tar.gz diff --git a/psmisc/Pkgfile b/psmisc/Pkgfile index fa4eb5e..6372cb3 100644 --- a/psmisc/Pkgfile +++ b/psmisc/Pkgfile @@ -5,9 +5,9 @@ # Depends on: ncurses name=psmisc -version=22.13 +version=22.20 release=1 -source=(http://dl.sourceforge.net/$name/$name-$version.tar.gz) +source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz) build() { cd $name-$version -- 2.26.2 From ee9464f75ca7688697052defd8c86650d68a0264 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:44:00 +0000 Subject: [PATCH 02/16] iproute2: deleted port --- iproute2/.footprint | 66 ------------------------------------------- iproute2/.md5sum | 2 -- iproute2/Pkgfile | 23 --------------- iproute2/net.iproute2 | 37 ------------------------ 4 files changed, 128 deletions(-) delete mode 100644 iproute2/.footprint delete mode 100644 iproute2/.md5sum delete mode 100644 iproute2/Pkgfile delete mode 100644 iproute2/net.iproute2 diff --git a/iproute2/.footprint b/iproute2/.footprint deleted file mode 100644 index 9699c13..0000000 --- a/iproute2/.footprint +++ /dev/null @@ -1,66 +0,0 @@ -drwxr-xr-x root/root etc/ -drwxr-xr-x root/root etc/iproute2/ --rw-r--r-- root/root etc/iproute2/ematch_map --rw-r--r-- root/root etc/iproute2/rt_dsfield --rw-r--r-- root/root etc/iproute2/rt_protos --rw-r--r-- root/root etc/iproute2/rt_realms --rw-r--r-- root/root etc/iproute2/rt_scopes --rw-r--r-- root/root etc/iproute2/rt_tables -drwxr-xr-x root/root etc/rc.d/ --rwxr-xr-x root/root etc/rc.d/net -drwxr-xr-x root/root lib/ -drwxr-xr-x root/root lib/tc/ -drwxr-xr-x root/root sbin/ --rwxr-xr-x root/root sbin/arpd -lrwxrwxrwx root/root sbin/ctstat -> lnstat --rwxr-xr-x root/root sbin/genl --rwxr-xr-x root/root sbin/ifcfg --rwxr-xr-x root/root sbin/ifstat --rwxr-xr-x root/root sbin/ip --rwxr-xr-x root/root sbin/lnstat --rwxr-xr-x root/root sbin/nstat --rwxr-xr-x root/root sbin/routef --rwxr-xr-x root/root sbin/routel --rwxr-xr-x root/root sbin/rtacct --rwxr-xr-x root/root sbin/rtmon --rwxr-xr-x root/root sbin/rtpr -lrwxrwxrwx root/root sbin/rtstat -> lnstat --rwxr-xr-x root/root sbin/ss --rwxr-xr-x root/root sbin/tc -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/tc/ --rw-r--r-- root/root usr/lib/tc/experimental.dist --rw-r--r-- root/root usr/lib/tc/normal.dist --rw-r--r-- root/root usr/lib/tc/pareto.dist --rw-r--r-- root/root usr/lib/tc/paretonormal.dist -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man3/ --rw-r--r-- root/root usr/man/man3/libnetlink.3.gz -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/arpd.8.gz -lrwxrwxrwx root/root usr/man/man8/ctstat.8.gz -> lnstat.8.gz --rw-r--r-- root/root usr/man/man8/ip.8.gz --rw-r--r-- root/root usr/man/man8/lnstat.8.gz -lrwxrwxrwx root/root usr/man/man8/nstat.8.gz -> rtacct.8.gz -lrwxrwxrwx root/root usr/man/man8/routef.8.gz -> routel.8.gz --rw-r--r-- root/root usr/man/man8/routel.8.gz --rw-r--r-- root/root usr/man/man8/rtacct.8.gz --rw-r--r-- root/root usr/man/man8/rtmon.8.gz -lrwxrwxrwx root/root usr/man/man8/rtstat.8.gz -> lnstat.8.gz --rw-r--r-- root/root usr/man/man8/ss.8.gz --rw-r--r-- root/root usr/man/man8/tc-bfifo.8.gz --rw-r--r-- root/root usr/man/man8/tc-cbq-details.8.gz --rw-r--r-- root/root usr/man/man8/tc-cbq.8.gz --rw-r--r-- root/root usr/man/man8/tc-drr.8.gz --rw-r--r-- root/root usr/man/man8/tc-htb.8.gz -lrwxrwxrwx root/root usr/man/man8/tc-pfifo.8.gz -> tc-bfifo.8.gz --rw-r--r-- root/root usr/man/man8/tc-pfifo_fast.8.gz --rw-r--r-- root/root usr/man/man8/tc-prio.8.gz --rw-r--r-- root/root usr/man/man8/tc-red.8.gz --rw-r--r-- root/root usr/man/man8/tc-sfq.8.gz --rw-r--r-- root/root usr/man/man8/tc-tbf.8.gz --rw-r--r-- root/root usr/man/man8/tc.8.gz -drwxr-xr-x root/root var/ -drwxr-xr-x root/root var/lib/ -drwxr-xr-x root/root var/lib/arpd/ diff --git a/iproute2/.md5sum b/iproute2/.md5sum deleted file mode 100644 index 93a10cd..0000000 --- a/iproute2/.md5sum +++ /dev/null @@ -1,2 +0,0 @@ -a243bfea837e71824b7ca26c3bb45fa8 iproute2-2.6.38.tar.bz2 -ffa5d168223f9e34302ec878ad58aec1 net.iproute2 diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile deleted file mode 100644 index c50c40d..0000000 --- a/iproute2/Pkgfile +++ /dev/null @@ -1,23 +0,0 @@ -# Description: A collection of utilites for controlling TCP/IP networking and traffic in Linux -# URL: http://linux-net.osdl.org/index.php/Iproute2 -# Maintainer: CRUX System Team, core-ports at crux dot nu -# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu -# Depends on: db - -name=iproute2 -version=2.6.38 -release=1 -source=(http://developer.osdl.org/dev/iproute2/download/$name-$version.tar.bz2 \ - net.iproute2) - -build() { - cd $name-$version - - sed -i "s|gcc |$CC $CFLAGS|g" configure - - make DBM_INCLUDE="$CLFS/usr/include" CC="$CC $CFLAGS" - make MANDIR=/usr/man DESTDIR=$PKG install - - rm -r $PKG/share - install -D -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net -} diff --git a/iproute2/net.iproute2 b/iproute2/net.iproute2 deleted file mode 100644 index c4b1bd1..0000000 --- a/iproute2/net.iproute2 +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# /etc/rc.d/net: start/stop network -# - -IF="eth0" -IP="192.168.1.100/24" -GW="192.168.1.1" - -case $1 in -start) - # loopback - /sbin/ip addr add 127.0.0.1/8 dev lo broadcast + scope host - /sbin/ip link set lo up - # ethernet - #/sbin/ip addr add $IP dev $IF broadcast + - #/sbin/ip link set $IF up - # default route - #/sbin/ip route add default via $GW - ;; -stop) - #/sbin/ip route del default - #/sbin/ip link set $IF down - #/sbin/ip addr del $IP dev $IF - /sbin/ip link set lo down - /sbin/ip addr del 127.0.0.1/8 dev lo - ;; -restart) - $0 stop - $0 start - ;; -*) - echo "usage: $0 [start|stop|restart]" - ;; -esac - -# End of file -- 2.26.2 From 0885445d084b79b55f8dfc14e66116f8606bacaa Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:44:45 +0000 Subject: [PATCH 03/16] automake: updated to 1.12.4 and removed perl dependency (not required for core-cross) --- automake/.footprint | 246 ++++++++++++++++++++++---------------------- automake/.md5sum | 2 +- automake/Pkgfile | 6 +- 3 files changed, 126 insertions(+), 128 deletions(-) diff --git a/automake/.footprint b/automake/.footprint index a1c0f9b..553b384 100644 --- a/automake/.footprint +++ b/automake/.footprint @@ -1,133 +1,131 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/aclocal --rwxr-xr-x root/root usr/bin/aclocal-1.11 +-rwxr-xr-x root/root usr/bin/aclocal-1.12 -rwxr-xr-x root/root usr/bin/automake --rwxr-xr-x root/root usr/bin/automake-1.11 +-rwxr-xr-x root/root usr/bin/automake-1.12 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/aclocal-1.11.1.gz +-rw-r--r-- root/root usr/man/man1/aclocal-1.12.1.gz -rw-r--r-- root/root usr/man/man1/aclocal.1.gz --rw-r--r-- root/root usr/man/man1/automake-1.11.1.gz +-rw-r--r-- root/root usr/man/man1/automake-1.12.1.gz -rw-r--r-- root/root usr/man/man1/automake.1.gz drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/aclocal-1.11/ --rw-r--r-- root/root usr/share/aclocal-1.11/amversion.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/as.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/auxdir.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/ccstdc.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/cond-if.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/cond.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/depend.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/depout.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/dmalloc.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/gcj.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/header.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/init.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/install-sh.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/lead-dot.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/lex.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/lispdir.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/maintainer.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/make.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/minuso.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/missing.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/mkdirp.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/multi.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/obsol-gt.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/obsol-lt.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/obsolete.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/options.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/protos.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/python.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/regex.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/runlog.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/sanity.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/silent.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/strip.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/substnot.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/tar.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/upc.m4 --rw-r--r-- root/root usr/share/aclocal-1.11/vala.m4 -drwxr-xr-x root/root usr/share/automake-1.11/ -drwxr-xr-x root/root usr/share/automake-1.11/Automake/ --rw-r--r-- root/root usr/share/automake-1.11/Automake/ChannelDefs.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Channels.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Condition.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Config.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Configure_ac.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/DisjConditions.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/FileUtils.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/General.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Item.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/ItemDef.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Location.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Options.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Rule.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/RuleDef.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Struct.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/VarDef.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Variable.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Version.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/Wrap.pm --rw-r--r-- root/root usr/share/automake-1.11/Automake/XFile.pm --rw-r--r-- root/root usr/share/automake-1.11/COPYING --rw-r--r-- root/root usr/share/automake-1.11/INSTALL --rwxr-xr-x root/root usr/share/automake-1.11/acinstall -drwxr-xr-x root/root usr/share/automake-1.11/am/ --rw-r--r-- root/root usr/share/automake-1.11/am/ansi2knr.am --rw-r--r-- root/root usr/share/automake-1.11/am/check.am --rw-r--r-- root/root usr/share/automake-1.11/am/check2.am --rw-r--r-- root/root usr/share/automake-1.11/am/clean-hdr.am --rw-r--r-- root/root usr/share/automake-1.11/am/clean.am --rw-r--r-- root/root usr/share/automake-1.11/am/compile.am --rw-r--r-- root/root usr/share/automake-1.11/am/configure.am --rw-r--r-- root/root usr/share/automake-1.11/am/data.am --rw-r--r-- root/root usr/share/automake-1.11/am/dejagnu.am --rw-r--r-- root/root usr/share/automake-1.11/am/depend.am --rw-r--r-- root/root usr/share/automake-1.11/am/depend2.am --rw-r--r-- root/root usr/share/automake-1.11/am/distdir.am --rw-r--r-- root/root usr/share/automake-1.11/am/footer.am --rw-r--r-- root/root usr/share/automake-1.11/am/header-vars.am --rw-r--r-- root/root usr/share/automake-1.11/am/header.am --rw-r--r-- root/root usr/share/automake-1.11/am/inst-vars.am --rw-r--r-- root/root usr/share/automake-1.11/am/install.am --rw-r--r-- root/root usr/share/automake-1.11/am/java.am --rw-r--r-- root/root usr/share/automake-1.11/am/lang-compile.am --rw-r--r-- root/root usr/share/automake-1.11/am/lex.am --rw-r--r-- root/root usr/share/automake-1.11/am/library.am --rw-r--r-- root/root usr/share/automake-1.11/am/libs.am --rw-r--r-- root/root usr/share/automake-1.11/am/libtool.am --rw-r--r-- root/root usr/share/automake-1.11/am/lisp.am --rw-r--r-- root/root usr/share/automake-1.11/am/ltlib.am --rw-r--r-- root/root usr/share/automake-1.11/am/ltlibrary.am --rw-r--r-- root/root usr/share/automake-1.11/am/mans-vars.am --rw-r--r-- root/root usr/share/automake-1.11/am/mans.am --rw-r--r-- root/root usr/share/automake-1.11/am/multilib.am --rw-r--r-- root/root usr/share/automake-1.11/am/program.am --rw-r--r-- root/root usr/share/automake-1.11/am/progs.am --rw-r--r-- root/root usr/share/automake-1.11/am/python.am --rw-r--r-- root/root usr/share/automake-1.11/am/remake-hdr.am --rw-r--r-- root/root usr/share/automake-1.11/am/scripts.am --rw-r--r-- root/root usr/share/automake-1.11/am/subdirs.am --rw-r--r-- root/root usr/share/automake-1.11/am/tags.am --rw-r--r-- root/root usr/share/automake-1.11/am/texi-vers.am --rw-r--r-- root/root usr/share/automake-1.11/am/texibuild.am --rw-r--r-- root/root usr/share/automake-1.11/am/texinfos.am --rw-r--r-- root/root usr/share/automake-1.11/am/vala.am --rw-r--r-- root/root usr/share/automake-1.11/am/yacc.am --rw-r--r-- root/root usr/share/automake-1.11/ansi2knr.1 --rw-r--r-- root/root usr/share/automake-1.11/ansi2knr.c --rwxr-xr-x root/root usr/share/automake-1.11/compile --rw-r--r-- root/root usr/share/automake-1.11/config-ml.in --rwxr-xr-x root/root usr/share/automake-1.11/config.guess --rwxr-xr-x root/root usr/share/automake-1.11/config.sub --rwxr-xr-x root/root usr/share/automake-1.11/depcomp --rwxr-xr-x root/root usr/share/automake-1.11/elisp-comp --rwxr-xr-x root/root usr/share/automake-1.11/install-sh --rwxr-xr-x root/root usr/share/automake-1.11/mdate-sh --rwxr-xr-x root/root usr/share/automake-1.11/missing --rwxr-xr-x root/root usr/share/automake-1.11/mkinstalldirs --rwxr-xr-x root/root usr/share/automake-1.11/py-compile --rwxr-xr-x root/root usr/share/automake-1.11/symlink-tree --rwxr-xr-x root/root usr/share/automake-1.11/ylwrap +drwxr-xr-x root/root usr/share/aclocal-1.12/ +-rw-r--r-- root/root usr/share/aclocal-1.12/amversion.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/ar-lib.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/as.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/auxdir.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/ccstdc.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/cond-if.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/cond.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/depend.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/depout.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/dmalloc.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/gcj.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/header.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/init.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/install-sh.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/lead-dot.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/lex.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/lispdir.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/maintainer.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/make.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/minuso.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/missing.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/mkdirp.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/obsol-gt.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/obsol-lt.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/obsolete.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/options.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/protos.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/python.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/runlog.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/sanity.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/silent.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/strip.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/substnot.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/tar.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/upc.m4 +-rw-r--r-- root/root usr/share/aclocal-1.12/vala.m4 +drwxr-xr-x root/root usr/share/aclocal/ +-rw-r--r-- root/root usr/share/aclocal/README +drwxr-xr-x root/root usr/share/automake-1.12/ +drwxr-xr-x root/root usr/share/automake-1.12/Automake/ +-rw-r--r-- root/root usr/share/automake-1.12/Automake/ChannelDefs.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Channels.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Condition.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Config.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Configure_ac.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/DisjConditions.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/FileUtils.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/General.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Getopt.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Item.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/ItemDef.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Location.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Options.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Rule.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/RuleDef.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/VarDef.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Variable.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Version.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/Wrap.pm +-rw-r--r-- root/root usr/share/automake-1.12/Automake/XFile.pm +-rw-r--r-- root/root usr/share/automake-1.12/COPYING +-rw-r--r-- root/root usr/share/automake-1.12/INSTALL +drwxr-xr-x root/root usr/share/automake-1.12/am/ +-rw-r--r-- root/root usr/share/automake-1.12/am/check.am +-rw-r--r-- root/root usr/share/automake-1.12/am/check2.am +-rw-r--r-- root/root usr/share/automake-1.12/am/clean-hdr.am +-rw-r--r-- root/root usr/share/automake-1.12/am/clean.am +-rw-r--r-- root/root usr/share/automake-1.12/am/compile.am +-rw-r--r-- root/root usr/share/automake-1.12/am/configure.am +-rw-r--r-- root/root usr/share/automake-1.12/am/data.am +-rw-r--r-- root/root usr/share/automake-1.12/am/dejagnu.am +-rw-r--r-- root/root usr/share/automake-1.12/am/depend.am +-rw-r--r-- root/root usr/share/automake-1.12/am/depend2.am +-rw-r--r-- root/root usr/share/automake-1.12/am/distdir.am +-rw-r--r-- root/root usr/share/automake-1.12/am/footer.am +-rw-r--r-- root/root usr/share/automake-1.12/am/header-vars.am +-rw-r--r-- root/root usr/share/automake-1.12/am/header.am +-rw-r--r-- root/root usr/share/automake-1.12/am/inst-vars.am +-rw-r--r-- root/root usr/share/automake-1.12/am/install.am +-rw-r--r-- root/root usr/share/automake-1.12/am/java.am +-rw-r--r-- root/root usr/share/automake-1.12/am/lang-compile.am +-rw-r--r-- root/root usr/share/automake-1.12/am/lex.am +-rw-r--r-- root/root usr/share/automake-1.12/am/library.am +-rw-r--r-- root/root usr/share/automake-1.12/am/libs.am +-rw-r--r-- root/root usr/share/automake-1.12/am/libtool.am +-rw-r--r-- root/root usr/share/automake-1.12/am/lisp.am +-rw-r--r-- root/root usr/share/automake-1.12/am/ltlib.am +-rw-r--r-- root/root usr/share/automake-1.12/am/ltlibrary.am +-rw-r--r-- root/root usr/share/automake-1.12/am/mans-vars.am +-rw-r--r-- root/root usr/share/automake-1.12/am/mans.am +-rw-r--r-- root/root usr/share/automake-1.12/am/program.am +-rw-r--r-- root/root usr/share/automake-1.12/am/progs.am +-rw-r--r-- root/root usr/share/automake-1.12/am/python.am +-rw-r--r-- root/root usr/share/automake-1.12/am/remake-hdr.am +-rw-r--r-- root/root usr/share/automake-1.12/am/scripts.am +-rw-r--r-- root/root usr/share/automake-1.12/am/subdirs.am +-rw-r--r-- root/root usr/share/automake-1.12/am/tags.am +-rw-r--r-- root/root usr/share/automake-1.12/am/texi-vers.am +-rw-r--r-- root/root usr/share/automake-1.12/am/texibuild.am +-rw-r--r-- root/root usr/share/automake-1.12/am/texinfos.am +-rw-r--r-- root/root usr/share/automake-1.12/am/vala.am +-rw-r--r-- root/root usr/share/automake-1.12/am/yacc.am +-rwxr-xr-x root/root usr/share/automake-1.12/ar-lib +-rwxr-xr-x root/root usr/share/automake-1.12/compile +-rwxr-xr-x root/root usr/share/automake-1.12/config.guess +-rwxr-xr-x root/root usr/share/automake-1.12/config.sub +-rwxr-xr-x root/root usr/share/automake-1.12/depcomp +-rwxr-xr-x root/root usr/share/automake-1.12/elisp-comp +-rwxr-xr-x root/root usr/share/automake-1.12/install-sh +-rwxr-xr-x root/root usr/share/automake-1.12/mdate-sh +-rwxr-xr-x root/root usr/share/automake-1.12/missing +-rwxr-xr-x root/root usr/share/automake-1.12/mkinstalldirs +-rwxr-xr-x root/root usr/share/automake-1.12/py-compile +-rwxr-xr-x root/root usr/share/automake-1.12/tap-driver.pl +-rwxr-xr-x root/root usr/share/automake-1.12/tap-driver.sh +-rwxr-xr-x root/root usr/share/automake-1.12/test-driver +-rwxr-xr-x root/root usr/share/automake-1.12/ylwrap diff --git a/automake/.md5sum b/automake/.md5sum index c1a0c2f..dda18cb 100644 --- a/automake/.md5sum +++ b/automake/.md5sum @@ -1 +1 @@ -c2972c4d9b3e29c03d5f2af86249876f automake-1.11.1.tar.bz2 +7395a0420ecb5c9bc43e5fcf4824df36 automake-1.12.4.tar.xz diff --git a/automake/Pkgfile b/automake/Pkgfile index 7cf7810..68f9b35 100644 --- a/automake/Pkgfile +++ b/automake/Pkgfile @@ -2,12 +2,12 @@ # URL: http://www.gnu.org/software/automake/ # Maintainer: CRUX System Team, core-ports at crux dot nu # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu -# Depends on: gawk perl autoconf +# Depends on: gawk autoconf name=automake -version=1.11.1 +version=1.12.4 release=1 -source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2) +source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz) build () { cd $name-$version -- 2.26.2 From 72c8cd6d4cf07aadd360735caee65a32a68390ab Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:45:22 +0000 Subject: [PATCH 04/16] gettext: fixed issues with glibc 'gets' removal (aligned with upstream) --- gettext/Pkgfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gettext/Pkgfile b/gettext/Pkgfile index 6a088cc..b7947a3 100644 --- a/gettext/Pkgfile +++ b/gettext/Pkgfile @@ -11,6 +11,9 @@ source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) build() { cd $name-$version + # fix for glibc 'gets' removal + sed -i -e '/gets is a/d' $name-*/*/stdio.in.h + cat > config.cache << EOF am_cv_func_iconv_works=yes gl_cv_func_wcwidth_works=yes -- 2.26.2 From 0fa35c195ac39a05f7f30d59c9279e40c911dd7b Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:45:48 +0000 Subject: [PATCH 05/16] sysfsutils: aligned with upstream --- sysfsutils/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysfsutils/Pkgfile b/sysfsutils/Pkgfile index eecc958..4c7259b 100644 --- a/sysfsutils/Pkgfile +++ b/sysfsutils/Pkgfile @@ -8,7 +8,7 @@ name=sysfsutils version=2.1.0 release=1 -source=(http://dl.sourceforge.net/sourceforge/linux-diag/$name-$version.tar.gz) +source=(http://downloads.sourceforge.net/project/linux-diag/$name/$version/$name-$version.tar.gz) build() { cd $name-$version -- 2.26.2 From b9e9f764d7ea6424d01414350d65ba8285aa8e94 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:46:25 +0000 Subject: [PATCH 06/16] libusb: aligned with upstream --- libusb/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libusb/Pkgfile b/libusb/Pkgfile index 336e41d..7f742d8 100644 --- a/libusb/Pkgfile +++ b/libusb/Pkgfile @@ -6,7 +6,7 @@ name=libusb version=1.0.8 release=1 -source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2) +source=(http://downloads.sourceforge.net/project/$name/$name-1.0/$name-$version/$name-$version.tar.bz2) build () { cd $name-$version -- 2.26.2 From 3166db3e466e7fe43db5e2bb7e8c1b6b79bc4b8a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:46:50 +0000 Subject: [PATCH 07/16] m4: fixed issues with glibc 'gets' removal (aligned with upstream) --- m4/Pkgfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/Pkgfile b/m4/Pkgfile index b85b553..e709cc2 100644 --- a/m4/Pkgfile +++ b/m4/Pkgfile @@ -11,6 +11,9 @@ source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2) build() { cd $name-$version + # fix for glibc 'gets' removal + sed -i -e '/gets is a/d' lib/stdio.in.h + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ -- 2.26.2 From a1e7e03e411cb965fab4de33791d4d62d4750892 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:47:17 +0000 Subject: [PATCH 08/16] pciutils: updated to 3.1.10 and aligned with upstream --- pciutils/.md5sum | 2 +- pciutils/Pkgfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pciutils/.md5sum b/pciutils/.md5sum index 544c7f2..7ebd845 100644 --- a/pciutils/.md5sum +++ b/pciutils/.md5sum @@ -1 +1 @@ -f3e349d22a3714b4272b171649ad5235 pciutils-3.1.7.tar.gz +cdb1e5a95ab7ac67349f10c8f77a6d3c pciutils-3.1.10.tar.gz diff --git a/pciutils/Pkgfile b/pciutils/Pkgfile index f737b75..dcfcb57 100644 --- a/pciutils/Pkgfile +++ b/pciutils/Pkgfile @@ -5,9 +5,9 @@ # Depends on: name=pciutils -version=3.1.7 +version=3.1.10 release=1 -source=(http://www.kernel.org/pub/software/utils/$name/$name-$version.tar.gz) +source=(ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$name-$version.tar.gz) build() { cd $name-$version -- 2.26.2 From 7eb084b8276d93b7ca7938618d25463c48deb675 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:47:40 +0000 Subject: [PATCH 09/16] zip: aligned with upstream --- zip/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zip/Pkgfile b/zip/Pkgfile index f8d434f..3f4b4c9 100644 --- a/zip/Pkgfile +++ b/zip/Pkgfile @@ -7,7 +7,7 @@ name=zip version=3.0 release=1 -source=(http://dl.sourceforge.net/sourceforge/infozip/${name}${version//./}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/infozip/${name}${version//./}.tar.gz) build() { cd ${name}${version//./} -- 2.26.2 From 54ee63dbe8ef812d5b428c517da9ddc997faa1f5 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:48:29 +0000 Subject: [PATCH 10/16] unzip: aligned with upstream --- unzip/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unzip/Pkgfile b/unzip/Pkgfile index 472cc98..205b11a 100644 --- a/unzip/Pkgfile +++ b/unzip/Pkgfile @@ -7,7 +7,7 @@ name=unzip version=6.0 release=1 -source=(http://dl.sourceforge.net/sourceforge/infozip/${name}${version//./}.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/infozip/${name}${version//./}.tar.gz) build() { cd ${name}${version//./} -- 2.26.2 From d4c1135240e44439fa793ff7f83c3ed9d7d79ff6 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:49:28 +0000 Subject: [PATCH 11/16] gcc: added patch to use the new /lib/ld-linux-armhf.so.3 linker provided by glibc 2.16.0 --- gcc/.md5sum | 2 +- gcc/Pkgfile | 1 + gcc/gcc-4.7.2-gnueabihf.patch | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gcc/.md5sum b/gcc/.md5sum index 0022146..6971689 100644 --- a/gcc/.md5sum +++ b/gcc/.md5sum @@ -1,3 +1,3 @@ -4d1f0b8cdba332c11014880162632080 gcc-4.7.2-gnueabihf.patch +2842d72b2e41e19a082cb73681dc5e41 gcc-4.7.2-gnueabihf.patch cc308a0891e778cfda7a151ab8a6e762 gcc-4.7.2.tar.bz2 a617c4d3fa11e0c9410ac213eb061677 gcc-nocheck-fixincludes.patch diff --git a/gcc/Pkgfile b/gcc/Pkgfile index e3f9a56..93fed35 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -36,6 +36,7 @@ build() { --enable-__cxa_atexit \ --enable-clocale=gnu \ --enable-shared \ + --with-float=hard \ --disable-nls \ --with-x=no \ --with-system-zlib \ diff --git a/gcc/gcc-4.7.2-gnueabihf.patch b/gcc/gcc-4.7.2-gnueabihf.patch index 8a77a7a..fd74b0e 100644 --- a/gcc/gcc-4.7.2-gnueabihf.patch +++ b/gcc/gcc-4.7.2-gnueabihf.patch @@ -133,3 +133,19 @@ diff -pruN gcc-4.7.2.orig/libstdc++-v3/configure.host gcc-4.7.2/libstdc++-v3/con port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver" ;; esac +diff -pruN gcc-4.7.2.orig/gcc/config/arm/linux-eabi.h gcc-4.7.2/gcc/config/arm/linux-eabi.h +--- gcc-4.7.2.orig/gcc/config/arm/linux-eabi.h 2012-11-26 14:44:44.335493878 +0000 ++++ gcc-4.7.2/gcc/config/arm/linux-eabi.h 2012-11-26 14:55:06.599515067 +0000 +@@ -62,7 +62,11 @@ + /* Use ld-linux.so.3 so that it will be possible to run "classic" + GNU/Linux binaries on an EABI system. */ + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" ++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" ++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" ++#define GLIBC_DYNAMIC_LINKER \ ++ "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \ ++ %{!mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "}" + + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ -- 2.26.2 From 1852319a2f6569d7d562e10cbe25b171c94c7c28 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:49:57 +0000 Subject: [PATCH 12/16] udev: fixed build with glibc 2.16 --- udev/.footprint | 35 +++++++++++++++-------------------- udev/.md5sum | 6 +++--- udev/Pkgfile | 38 +++++++++++++++++--------------------- udev/start_udev | 15 +++++---------- 4 files changed, 40 insertions(+), 54 deletions(-) diff --git a/udev/.footprint b/udev/.footprint index 402d325..19c1cac 100644 --- a/udev/.footprint +++ b/udev/.footprint @@ -4,60 +4,55 @@ drwxr-xr-x root/root etc/udev/rules.d/ -rw-r--r-- root/root etc/udev/udev.conf drwxr-xr-x root/root lib/ drwxr-xr-x root/root lib/firmware/ -lrwxrwxrwx root/root lib/libudev.so.0 -> libudev.so.0.11.1 --rwxr-xr-x root/root lib/libudev.so.0.11.1 +lrwxrwxrwx root/root lib/libudev.so.0 -> libudev.so.0.13.1 +-rwxr-xr-x root/root lib/libudev.so.0.13.1 drwxr-xr-x root/root lib/udev/ +-rwxr-xr-x root/root lib/udev/accelerometer -rwxr-xr-x root/root lib/udev/ata_id -rwxr-xr-x root/root lib/udev/cdrom_id -rwxr-xr-x root/root lib/udev/collect --rwxr-xr-x root/root lib/udev/create_floppy_devices drwxr-xr-x root/root lib/udev/devices/ -crw------- root/root lib/udev/devices/console (5, 1) -crw------- root/root lib/udev/devices/kmsg (1, 11) -crw-rw-rw- root/root lib/udev/devices/null (1, 3) drwxr-xr-x root/root lib/udev/devices/pts/ drwxr-xr-x root/root lib/udev/devices/shm/ -crw-rw-rw- root/root lib/udev/devices/zero (1, 5) --rwxr-xr-x root/root lib/udev/edd_id --rwxr-xr-x root/root lib/udev/firmware --rwxr-xr-x root/root lib/udev/input_id --rwxr-xr-x root/root lib/udev/path_id +-rwxr-xr-x root/root lib/udev/mtd_probe -rw-r--r-- root/root lib/udev/rule_generator.functions drwxr-xr-x root/root lib/udev/rules.d/ --rw-r--r-- root/root lib/udev/rules.d/42-qemu-usb.rules --rw-r--r-- root/root lib/udev/rules.d/50-firmware.rules +-rw-r--r-- root/root lib/udev/rules.d/42-usb-hid-pm.rules -rw-r--r-- root/root lib/udev/rules.d/50-udev-default.rules -rw-r--r-- root/root lib/udev/rules.d/60-cdrom_id.rules --rw-r--r-- root/root lib/udev/rules.d/60-floppy.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-alsa.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-input.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-serial.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-storage-tape.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-storage.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-v4l.rules --rw-r--r-- root/root lib/udev/rules.d/61-persistent-storage-edd.rules +-rw-r--r-- root/root lib/udev/rules.d/61-accelerometer.rules -rw-r--r-- root/root lib/udev/rules.d/75-cd-aliases-generator.rules +-rw-r--r-- root/root lib/udev/rules.d/75-net-description.rules -rw-r--r-- root/root lib/udev/rules.d/75-persistent-net-generator.rules +-rw-r--r-- root/root lib/udev/rules.d/75-probe_mtd.rules +-rw-r--r-- root/root lib/udev/rules.d/75-tty-description.rules +-rw-r--r-- root/root lib/udev/rules.d/78-sound-card.rules -rw-r--r-- root/root lib/udev/rules.d/80-drivers.rules +-rw-r--r-- root/root lib/udev/rules.d/81-crux.rules -rw-r--r-- root/root lib/udev/rules.d/95-udev-late.rules -rwxr-xr-x root/root lib/udev/scsi_id --rwxr-xr-x root/root lib/udev/usb_id +-rwxr-xr-x root/root lib/udev/udevd -rwxr-xr-x root/root lib/udev/v4l_id -rwxr-xr-x root/root lib/udev/write_cd_rules -rwxr-xr-x root/root lib/udev/write_net_rules +drwxr-xr-x root/root run/ drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/start_udev -rwxr-xr-x root/root sbin/udevadm --rwxr-xr-x root/root sbin/udevd +lrwxrwxrwx root/root sbin/udevd -> ../lib/udev/udevd drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/udevinfo -> /sbin/udevadm drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libudev.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libudev.a -rwxr-xr-x root/root usr/lib/libudev.la -lrwxrwxrwx root/root usr/lib/libudev.so -> ../../lib/libudev.so.0.11.1 +lrwxrwxrwx root/root usr/lib/libudev.so -> ../../lib/libudev.so.0.13.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libudev.pc drwxr-xr-x root/root usr/man/ diff --git a/udev/.md5sum b/udev/.md5sum index f698572..23c8b58 100644 --- a/udev/.md5sum +++ b/udev/.md5sum @@ -1,3 +1,3 @@ -167288ed62db73b0b93b20506a08d064 start_udev -4b37e1222f06c14c24147de346aa0bad udev-167.tar.bz2 -53554c9688df0f5e87e38a86e4314c61 udev-disable_extras.patch +ee21e150df6c804eef03a6cb2fc1cceb 81-crux.rules +585b2d60139c1a3a03fea06c5c16f2a8 start_udev +023877e6cc0d907994b8c648beab542b udev-182.tar.xz diff --git a/udev/Pkgfile b/udev/Pkgfile index 06944d3..3e8d0d4 100644 --- a/udev/Pkgfile +++ b/udev/Pkgfile @@ -4,48 +4,44 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=udev -version=167 +version=182 release=1 -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \ - $name-disable_extras.patch start_udev) +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.xz \ + 81-crux.rules start_udev) build() { cd udev-$version - patch -p1 -i $SRC/$name-disable_extras.patch - - autoreconf ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ - --sbindir=/sbin \ + --sbindir=/sbin --bindir=/sbin \ --sysconfdir=/etc \ --with-rootlibdir=/lib \ - --libexecdir=/lib/udev \ + --with-rootprefix= \ + --libexecdir=/lib \ --mandir=/usr/man \ - --disable-extras \ --disable-introspection \ - --enable-static + --disable-gudev \ + --disable-udev_acl \ + --disable-keymap \ + --enable-static \ + --enable-rule_generator \ + --with-pci-ids-path=$CLFS/usr/share make make install DESTDIR=$PKG mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}} - mkdir -p $PKG/lib + mkdir -p $PKG/{lib,sbin,run} - # Populate nodes - mknod -m 600 $PKG/lib/udev/devices/console c 5 1 - mknod -m 600 $PKG/lib/udev/devices/kmsg c 1 11 - mknod -m 666 $PKG/lib/udev/devices/null c 1 3 - mknod -m 666 $PKG/lib/udev/devices/zero c 1 5 + # Symlink to udevd + ln -s ../lib/udev/udevd $PKG/sbin/udevd # Add CRUX items install -m 0755 $SRC/start_udev $PKG/sbin - - # Keep udevinfo for legacy support - mkdir -p $PKG/usr/bin - ln -s /sbin/udevadm $PKG/usr/bin/udevinfo + install -m 0644 $SRC/81-crux.rules $PKG/lib/udev/rules.d # Remove junk - rm -rf $PKG/usr/share/{gtk-,}doc + rm -r $PKG/usr/share/{gtk-,}doc } diff --git a/udev/start_udev b/udev/start_udev index 3319a4d..d8f4b26 100644 --- a/udev/start_udev +++ b/udev/start_udev @@ -1,6 +1,6 @@ #!/bin/sh -# - if /dev is not mounted - mount as a devtmpfs (CONFIG_DEVTMPFS=y) or tmpfs +# - if /dev is not mounted - mount as a devtmpfs (CONFIG_DEVTMPFS=y) # - if /dev is mounted (e.g. due to handover from initramfs or # CONFIG_DEVTMPFS_MOUNT=y), remount with specific options # - some video drivers require exec access in /dev, thus it's set here @@ -10,14 +10,12 @@ UDEVOPTS="exec,nosuid,noatime,mode=0755,nr_blocks=2048,nr_inodes=16384" if /bin/mountpoint -q /dev ; then /bin/mount -n -o remount,${UDEVOPTS} dev /dev else - if /bin/sed -n '/devtmpfs/q1' /proc/filesystems ; then - UDEVFS=tmpfs - else - UDEVFS=devtmpfs - fi - /bin/mount -n -t $UDEVFS -o ${UDEVOPTS} dev /dev + /bin/mount -n -t devtmpfs -o ${UDEVOPTS} dev /dev fi +# mount /run directory +/bin/mount -n -t tmpfs -o mode=0755,nosuid,nodev,exec tmpfs /run + # make sure hotplugger is not set echo > /proc/sys/kernel/hotplug @@ -32,6 +30,3 @@ test -z "$(/bin/pidof -s udevd)" && /sbin/udevd --daemon /sbin/udevadm trigger --type=devices --action=add /sbin/udevadm settle -# retry any failures -/sbin/udevadm trigger --type=failed --action=add -/sbin/udevadm settle -- 2.26.2 From cd4c02434f736fd2a42d5e988c2be314432a263d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:50:21 +0000 Subject: [PATCH 13/16] sysvinit: aligned with upstream --- sysvinit/.footprint | 4 ---- sysvinit/Pkgfile | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysvinit/.footprint b/sysvinit/.footprint index ad02aa9..77505ef 100644 --- a/sysvinit/.footprint +++ b/sysvinit/.footprint @@ -1,5 +1,4 @@ drwxr-xr-x root/root bin/ --rwxr-xr-x root/root bin/mountpoint lrwxrwxrwx root/root bin/pidof -> /sbin/killall5 drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/bootlogd @@ -18,7 +17,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/last lrwxrwxrwx root/root usr/bin/lastb -> last -rwxr-xr-x root/root usr/bin/mesg --rwxr-xr-x root/root usr/bin/utmpdump -rwxr-xr-x root/root usr/bin/wall drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/initreq.h @@ -27,8 +25,6 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/last.1.gz -rw-r--r-- root/root usr/man/man1/lastb.1.gz -rw-r--r-- root/root usr/man/man1/mesg.1.gz --rw-r--r-- root/root usr/man/man1/mountpoint.1.gz --rw-r--r-- root/root usr/man/man1/utmpdump.1.gz -rw-r--r-- root/root usr/man/man1/wall.1.gz drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/initscript.5.gz diff --git a/sysvinit/Pkgfile b/sysvinit/Pkgfile index 9a97821..4f6cca5 100644 --- a/sysvinit/Pkgfile +++ b/sysvinit/Pkgfile @@ -13,6 +13,10 @@ build() { cd $name-${version}dsf make -C src CC="$CC" make -C src ROOT=$PKG MANDIR=/usr/man install + # Provided by util-linux + rm $PKG/{bin/mountpoint,usr/bin/utmpdump} + rm $PKG/usr/man/man1/{mountpoint,utmpdump}.1 + install -d $PKG/var/log touch $PKG/var/log/wtmp touch $PKG/var/log/btmp -- 2.26.2 From 8499ab6ed87ca1e1e13747105866027360509f65 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:51:52 +0000 Subject: [PATCH 14/16] rc: aligned with upstream --- rc/.md5sum | 2 +- rc/Pkgfile | 2 +- rc/rc | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rc/.md5sum b/rc/.md5sum index ddfaef5..8a410a8 100644 --- a/rc/.md5sum +++ b/rc/.md5sum @@ -1,5 +1,5 @@ d2a8e98a8b10ba09b2a9da34326b526a inittab -ef539e1a7680641ef76b38001eb86682 rc +3858dfcab370c4e9b9d7356a1d3464a1 rc c8fe38143dffbbc628a7a33966fae408 rc.conf afe5cd67920474246ae74e54a9845339 rc.fix d1be35927946756c68242f29c16ee983 rc.local diff --git a/rc/Pkgfile b/rc/Pkgfile index e074cf2..e4098d8 100644 --- a/rc/Pkgfile +++ b/rc/Pkgfile @@ -5,7 +5,7 @@ name=rc version=2.26 -release=1 +release=3 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf) build() { diff --git a/rc/rc b/rc/rc index 1ae73c2..4fc61d2 100644 --- a/rc/rc +++ b/rc/rc @@ -9,8 +9,8 @@ echo "The system is coming up. Please wait." . /etc/rc.conf # Start udev -/bin/mount -n -t proc none /proc -/bin/mount -n -t sysfs none /sys +/bin/mount -t proc none /proc +/bin/mount -t sysfs none /sys /sbin/start_udev # Create device-mapper device nodes and scan for LVM volume groups @@ -19,8 +19,13 @@ if [ -x /sbin/lvm ]; then /sbin/vgchange --ignorelockingfailure -a y fi +# Scan for btrfs volumes to simplify fstab entries +if [ -r /sys/fs/btrfs ]; then + /sbin/btrfs dev scan +fi + # Mount root read-only -/bin/mount -n -o remount,ro / +/bin/mount -o remount,ro / if [ -f /forcefsck ]; then FORCEFSCK="-f" @@ -43,16 +48,12 @@ if [ $? -gt 1 ]; then /sbin/sulogin -p echo "Automatic reboot in progress..." /bin/umount -a -r - /bin/mount -n -o remount,ro / + /bin/mount -o remount,ro / /sbin/reboot -f exit 0 fi # Mount local filesystems -/bin/mount -n -o remount,rw / -/bin/umount /sys /proc -/bin/rm -f /etc/mtab* -/bin/touch /etc/mtab /bin/mount -o remount,rw / /bin/mount -a -O no_netdev -- 2.26.2 From 3d1b1cf0e2ec3289e179a5afa611e5e20802e762 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:54:06 +0000 Subject: [PATCH 15/16] ports: remove all .rsync files (ports in core-cross no longer uses rsync) and adapted to use overlay hardfp repository --- ports/.footprint | 9 ++------- ports/.md5sum | 7 ------- ports/Pkgfile | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ports/.footprint b/ports/.footprint index afcfce4..260646a 100644 --- a/ports/.footprint +++ b/ports/.footprint @@ -1,13 +1,8 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/ports/ --rw-r--r-- root/root etc/ports/contrib.rsync.inactive --rw-r--r-- root/root etc/ports/core-arm.rsync --rw-r--r-- root/root etc/ports/core.rsync +-rw-r--r-- root/root etc/ports/core-arm.httpup +-rw-r--r-- root/root etc/ports/core.httpup drwxr-xr-x root/root etc/ports/drivers/ --rw-r--r-- root/root etc/ports/opt-arm.rsync --rw-r--r-- root/root etc/ports/opt.rsync --rw-r--r-- root/root etc/ports/xorg-arm.rsync --rw-r--r-- root/root etc/ports/xorg.rsync drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ports diff --git a/ports/.md5sum b/ports/.md5sum index 32a671c..9e51d7b 100644 --- a/ports/.md5sum +++ b/ports/.md5sum @@ -1,8 +1 @@ -c79603d71569837b6848c5cb320c44bd contrib.rsync.inactive -2ed3873acf5ecfec6575a69d1a200ace core-arm.rsync -b77a6e0dd97a45652de03bd3a82a416f core.rsync -c9abc72a1ccfdef8fd1ec5162617cae2 opt-arm.rsync -03246f47123cd2342ddfaf4c44fa9c89 opt.rsync 1f178e2bb1beab9782993931c9832280 ports-1.5.tar.gz -eaf090c823185bd08fa041905cee8dda xorg-arm.rsync -320d50cc72759a55097b1b2d4c40da9a xorg.rsync diff --git a/ports/Pkgfile b/ports/Pkgfile index 9827061..9cd1917 100644 --- a/ports/Pkgfile +++ b/ports/Pkgfile @@ -6,14 +6,22 @@ name=ports version=1.5 release=11 -source=(http://crux.nu/files/tools/ports/$name-$version.tar.gz \ - core.rsync opt.rsync xorg.rsync contrib.rsync.inactive \ - core-arm.rsync opt-arm.rsync xorg-arm.rsync) +source=(http://crux.nu/files/tools/ports/$name-$version.tar.gz) build () { cd $name-$version make make DESTDIR=$PKG install - install -m 0644 $SRC/*.rsync* $PKG/etc/ports + # use httpup for core-cross since we don't have rsync + # also note that we only need core and core-arm overlay + cat > $PKG/etc/ports/core.httpup << __EOF__ +ROOT_DIR=/usr/ports/core +URL=http://crux.nu/ports/crux-2.8/core +__EOF__ + cat > $PKG/etc/ports/core-arm.httpup << __EOF__ +ROOT_DIR=/usr/ports/core-armhf +URL=http://crux-arm.nu/ports/crux-2.8/core-armhf +__EOF__ } + -- 2.26.2 From 0ccd755c9529b784d9d0f6a677ef6f4a45818dcc Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 28 Nov 2012 16:54:58 +0000 Subject: [PATCH 16/16] prt-get: commented out opt/xorg collections in prt-get.conf --- prt-get/.md5sum | 2 +- prt-get/prt-get.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/prt-get/.md5sum b/prt-get/.md5sum index 718d045..9bbaa7a 100644 --- a/prt-get/.md5sum +++ b/prt-get/.md5sum @@ -1,4 +1,4 @@ d0abf2a28823f9527c36832d5cbb8257 prt-get-5.18.tar.gz 4f6b710e4d2b18c70cfe5e4a593938b7 prt-get.aliases -a12012a592e978f06dae8cc1eab75b50 prt-get.conf +19045beb7d1b510502922ff3541cf0f4 prt-get.conf b4eeea27244550754219801bcf29c5e3 prt-get.diff diff --git a/prt-get/prt-get.conf b/prt-get/prt-get.conf index cc42552..934357e 100644 --- a/prt-get/prt-get.conf +++ b/prt-get/prt-get.conf @@ -4,11 +4,11 @@ # note: the order matters: the package found first is used prtdir /usr/ports/core-arm -prtdir /usr/ports/opt-arm -prtdir /usr/ports/xorg-arm +#prtdir /usr/ports/opt-arm +#prtdir /usr/ports/xorg-arm prtdir /usr/ports/core -prtdir /usr/ports/opt -prtdir /usr/ports/xorg +#prtdir /usr/ports/opt +#prtdir /usr/ports/xorg # the following line enables the user maintained contrib collection #prtdir /usr/ports/contrib -- 2.26.2