ports/opt (2.2): [notify] iproute2: updated to 2.6.18-061002, changed sbin location
commit a2afce8c04042bdf0ddf737045583626c7bf3cdc Author: Simone Rota <sip@crux.nu> Date: Tue Nov 14 13:36:41 2006 +0100 [notify] iproute2: updated to 2.6.18-061002, changed sbin location We now use /sbin instead of /usr/sbin for iproute2 binaries, you may need to adjust your configuration to reflect the change. diff --git a/iproute2/.footprint b/iproute2/.footprint index 8209c56..d0482bf 100644 --- a/iproute2/.footprint +++ b/iproute2/.footprint @@ -6,6 +6,23 @@ drwxr-xr-x root/root etc/iproute2/ -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 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/ @@ -31,19 +48,3 @@ lrwxrwxrwx root/root usr/man/man8/tc-pfi -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 usr/sbin/ --rwxr-xr-x root/root usr/sbin/arpd -lrwxrwxrwx root/root usr/sbin/ctstat -> lnstat --rwxr-xr-x root/root usr/sbin/ifcfg --rwxr-xr-x root/root usr/sbin/ifstat --rwxr-xr-x root/root usr/sbin/ip --rwxr-xr-x root/root usr/sbin/lnstat --rwxr-xr-x root/root usr/sbin/nstat --rwxr-xr-x root/root usr/sbin/routef --rwxr-xr-x root/root usr/sbin/routel --rwxr-xr-x root/root usr/sbin/rtacct --rwxr-xr-x root/root usr/sbin/rtmon --rwxr-xr-x root/root usr/sbin/rtpr -lrwxrwxrwx root/root usr/sbin/rtstat -> lnstat --rwxr-xr-x root/root usr/sbin/ss --rwxr-xr-x root/root usr/sbin/tc diff --git a/iproute2/.md5sum b/iproute2/.md5sum index 0de3717..d24763e 100644 --- a/iproute2/.md5sum +++ b/iproute2/.md5sum @@ -1 +1 @@ -f31d4516b35bbfeaa72c762f5959e97c iproute2-2.6.16-060323.tar.gz +193b570128cf852afba337438413adf9 iproute2-2.6.18-061002.tar.gz diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile index f2b69aa..10ea8b1 100644 --- a/iproute2/Pkgfile +++ b/iproute2/Pkgfile @@ -4,12 +4,13 @@ # Packager: Mikhail Kolesnik, mike at openbunker dot org name=iproute2 -version=2.6.16-060323 -release=3 +version=2.6.18-061002 +release=1 source=(http://developer.osdl.org/dev/iproute2/download/$name-$version.tar.gz) build() { cd $name-$version + sed -i -e "s|SBINDIR=/usr/sbin|SBINDIR=/sbin|" Makefile sed -i -e "s|MANDIR=/usr/share/man|MANDIR=/usr/man|" Makefile make KERNEL_INCLUDE="/lib/modules/`uname -r`/source/include" make DESTDIR=$PKG install
Hi, On 2006-11-14 at 13:37, crux@crux.nu wrote:
+ sed -i -e "s|SBINDIR=/usr/sbin|SBINDIR=/sbin|" Makefile sed -i -e "s|MANDIR=/usr/share/man|MANDIR=/usr/man|" Makefile
I might be missing something, but why is sed used here? diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile index 10ea8b1..2c34a87 100644 --- a/iproute2/Pkgfile +++ b/iproute2/Pkgfile @@ -10,9 +10,7 @@ source=(http://developer.osdl.org/dev/ip build() { cd $name-$version - sed -i -e "s|SBINDIR=/usr/sbin|SBINDIR=/sbin|" Makefile - sed -i -e "s|MANDIR=/usr/share/man|MANDIR=/usr/man|" Makefile make KERNEL_INCLUDE="/lib/modules/`uname -r`/source/include" - make DESTDIR=$PKG install + make SBINDIR=/sbin MANDIR=/usr/man DESTDIR=$PKG install rm -rf $PKG/usr/share } -- Antti Nykänen | aon@iki.fi | http://aon.iki.fi/
Hello, Antti. On Tue, 14 Nov 2006 14:55:42 +0200 Antti Nykänen <aon@iki.fi> wrote:
Hi,
On 2006-11-14 at 13:37, crux@crux.nu wrote:
+ sed -i -e "s|SBINDIR=/usr/sbin|SBINDIR=/sbin|" Makefile sed -i -e "s|MANDIR=/usr/share/man|MANDIR=/usr/man|" Makefile
I might be missing something, but why is sed used here? I suppose it was my fault in MANDIR's case. Simone was a victim of copy-paste process I guess =)
Another question is if it's conceptually right to keep iproute2 in opt, not in core (if /etc/rc.d/net would utilize these utils in the next release)? -- Mikhail Kolesnik ICQ: 260259143 IRC: mike_k at freenode/#crux, rusnet/#yalta Jabber: mike_k@jabber.lafox.net NIC handle: MKK83-UANIC
Mikhail Kolesnik [2006-11-14 15:41]:
Another question is if it's conceptually right to keep iproute2 in opt, not in core (if /etc/rc.d/net would utilize these utils in the next release)?
Well, in that case, we'll move it from opt to core in the next release :D That is, it would be moved in the "2.3" branches of core.git and opt.git. No need to do that change in the 2.2 branches. Regards, Tilman -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing on usenet and in e-mail?
On Tue, 2006-11-14 at 19:37 +0100, Tilman Sauerbeck wrote:
That is, it would be moved in the "2.3" branches of core.git and opt.git. No need to do that change in the 2.2 branches.
Speaking of which, is there a schedule for branching 2.3, let alone start developing it? Also, in the future, would it be better to branch at the time of release, instead of 9 months later? E.g. development would happen in HEAD and 2.3 would be branched when the ISO is made available. This would make the "I just want a stable distro" guys happy while allowing more experiments during (and give more time for) development. The 2.1 -> 2.2 and 2.2 -> 2.3 cycle have been mostly like this: branch -> (3 months) major core updates -> release -> (9 months) version bumps Proposed cycle would be: (12 months) development -> branch -> security fixes This is how most projects do their release cycles and my guess is that CRUX did it in the previous style because Per developed privately, released and then committed updates till the next one was ready.
participants (5)
-
Antti Nykänen -
crux＠crux.nu -
Mark Rosenstand -
Mikhail Kolesnik -
Tilman Sauerbeck