* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 234f0305ba31ae499714193c594279aabe3f9ca4
@ 2012-08-22 8:12 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-08-22 8:12 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7235 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 234f0305ba31ae499714193c594279aabe3f9ca4 (commit)
via c4ef5c452c2ced3cae3c1bda3bc9284385197088 (commit)
from 76eb1f9c86ba8675af5484c0225d565f563dad9c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 234f0305ba31ae499714193c594279aabe3f9ca4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 22 10:11:04 2012 +0200
grep: Update to 2.14.
Fixes #10213.
commit c4ef5c452c2ced3cae3c1bda3bc9284385197088
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Aug 22 09:54:16 2012 +0200
kernel: Move modules to /usr/lib.
-----------------------------------------------------------------------
Summary of changes:
grep/grep.nm | 2 +-
kernel/kernel.nm | 60 +++++++++++++++++++++++++++---------------------------
2 files changed, 31 insertions(+), 31 deletions(-)
Difference in files:
diff --git a/grep/grep.nm b/grep/grep.nm
index a41eaf7..983dc7b 100644
--- a/grep/grep.nm
+++ b/grep/grep.nm
@@ -4,7 +4,7 @@
###############################################################################
name = grep
-version = 2.13
+version = 2.14
release = 1
groups = Applications/Text
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 41ccf8e..fb5813c 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name = kernel
version = 3.5.1
-release = 0.3
+release = 0.4
thisapp = linux-%{version}
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -215,7 +215,7 @@ build
%{kernel_build_flags} %{PARALLELISMFLAGS}
# Install the results.
- mkdir -pv %{BUILDROOT}/boot %{BUILDROOT}/lib/modules/${fullversion}
+ mkdir -pv %{BUILDROOT}/boot %{BUILDROOT}/usr/lib/modules/${fullversion}
install -m 755 %{kernel_image} %{BUILDROOT}/boot/vmlinuz-${fullversion}
install -m 644 .config %{BUILDROOT}/boot/config-${fullversion}
install -m 644 System.map %{BUILDROOT}/boot/System.map-${fullversion}
@@ -224,7 +224,7 @@ build
dd if=/dev/zero of=%{BUILDROOT}/boot/initramfs-${fullversion}.img bs=1M count=20
# Install modules.
- make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} mod-fw= \
+ make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT}/usr mod-fw= \
KERNELRELEASE=${fullversion} modules_install
# Install vdso.
@@ -243,45 +243,45 @@ build
# And now the scary looking part.
#
# Recreate source and build links.
- rm -vf %{BUILDROOT}/lib/modules/${fullversion}/{build,source}
- mkdir -pv %{BUILDROOT}/lib/modules/${fullversion}/build
- ln -svf build %{BUILDROOT}/lib/modules/${fullversion}/source
+ rm -vf %{BUILDROOT}/usr/lib/modules/${fullversion}/{build,source}
+ mkdir -pv %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+ ln -svf build %{BUILDROOT}/usr/lib/modules/${fullversion}/source
# Create dirs for extra modules.
- mkdir -pv %{BUILDROOT}/lib/modules/${fullversion}/extra
+ mkdir -pv %{BUILDROOT}/usr/lib/modules/${fullversion}/extra
cp -v --parents $(find -type f -name "Makefile*" -o -name "Kconfig*") \
- %{BUILDROOT}/lib/modules/${fullversion}/build
+ %{BUILDROOT}/usr/lib/modules/${fullversion}/build
cp -v Module.symvers System.map \
- %{BUILDROOT}/lib/modules/${fullversion}/build
- rm -vrf %{BUILDROOT}/lib/modules/${fullversion}/build/{Documentation,scripts,include}
+ %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+ rm -vrf %{BUILDROOT}/usr/lib/modules/${fullversion}/build/{Documentation,scripts,include}
- cp -v .config %{BUILDROOT}/lib/modules/${fullversion}/build
- cp -va scripts %{BUILDROOT}/lib/modules/${fullversion}/build
- find %{BUILDROOT}/lib/modules/${fullversion}/build/scripts -name "*.o" \
+ cp -v .config %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+ cp -va scripts %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+ find %{BUILDROOT}/usr/lib/modules/${fullversion}/build/scripts -name "*.o" \
-exec rm -vf {} \;
cp -va --parents arch/%{kernel_arch}/include \
- %{BUILDROOT}/lib/modules/${fullversion}/build
- cp -va include %{BUILDROOT}/lib/modules/${fullversion}/build/include
+ %{BUILDROOT}/usr/lib/modules/${fullversion}/build
+ cp -va include %{BUILDROOT}/usr/lib/modules/${fullversion}/build/include
# Make sure we can build external modules.
- touch -r %{BUILDROOT}/lib/modules/${fullversion}/build/Makefile \
- %{BUILDROOT}/lib/modules/${fullversion}/build/include/linux/version.h
- touch -r %{BUILDROOT}/lib/modules/${fullversion}/build/.config \
- %{BUILDROOT}/lib/modules/${fullversion}/build/autoconf.h
- cp -v %{BUILDROOT}/lib/modules/${fullversion}/build/.config \
- %{BUILDROOT}/lib/modules/${fullversion}/build/include/config/auto.conf
-
- find %{BUILDROOT}/lib/modules/${fullversion} -name "*.ko" -type f | \
+ touch -r %{BUILDROOT}/usr/lib/modules/${fullversion}/build/Makefile \
+ %{BUILDROOT}/usr/lib/modules/${fullversion}/build/include/linux/version.h
+ touch -r %{BUILDROOT}/usr/lib/modules/${fullversion}/build/.config \
+ %{BUILDROOT}/usr/lib/modules/${fullversion}/build/autoconf.h
+ cp -v %{BUILDROOT}/usr/lib/modules/${fullversion}/build/.config \
+ %{BUILDROOT}/usr/lib/modules/${fullversion}/build/include/config/auto.conf
+
+ find %{BUILDROOT}/usr/lib/modules/${fullversion} -name "*.ko" -type f | \
xargs chmod u+x
# Move all development files to /usr/src.
mkdir -pv %{BUILDROOT}/usr/src/kernels
- mv -v %{BUILDROOT}/lib/modules/${fullversion}/build \
+ mv -v %{BUILDROOT}/usr/lib/modules/${fullversion}/build \
%{BUILDROOT}/usr/src/kernels/${fullversion}
- ln -svf ../../../usr/src/kernels/${fullversion} \
- %{BUILDROOT}/lib/modules/${fullversion}/build
+ ln -svf ../../../src/kernels/${fullversion} \
+ %{BUILDROOT}/usr/lib/modules/${fullversion}/build
find %{BUILDROOT}/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
}
@@ -366,7 +366,7 @@ packages
/boot/vmlinuz-%{kernel_release}
/boot/initramfs-%{kernel_release}.img
/etc/ld.so.conf.d/kernel-%{kernel_release}.conf
- /lib/modules/%{kernel_release}
+ /usr/lib/modules/%{kernel_release}
end
_posttrans
@@ -411,8 +411,8 @@ packages
end
files
- /lib/modules/%{kernel_release}/build
- /lib/modules/%{kernel_release}/source
+ /usr/lib/modules/%{kernel_release}/build
+ /usr/lib/modules/%{kernel_release}/source
/usr/src/kernels/%{kernel_release}
end
end
@@ -501,8 +501,8 @@ packages
files
/
!/boot
- !/lib/modules
!/usr/include
+ !/usr/lib/modules
!/usr/src
!/usr/src/debug
!/usr/lib/debug
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-22 8:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-22 8:12 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 234f0305ba31ae499714193c594279aabe3f9ca4 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox