[oe-commits] org.oe.dev merge of '728b58626c50e060bf71960029afce111427d6a0'
oe commit
openembedded-commits at lists.openembedded.org
Sun Jan 6 17:55:02 UTC 2008
merge of '728b58626c50e060bf71960029afce111427d6a0'
and 'c22898d69793df7ecf7b5bb1e62791c4780023ab'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 2e62684434bad8e7a1ee7889de6b7bd78e7a5331
ViewMTN: http://monotone.openembedded.org/revision/info/2e62684434bad8e7a1ee7889de6b7bd78e7a5331
Files:
1
packages/linux/linux-ixp4xx/defconfig-2.6.23.8
packages/linux/linux-ixp4xx/defconfig-2.6.23.12
packages/linux/linux-ixp4xx_2.6.23.8.bb
packages/linux/linux-ixp4xx_2.6.23.12.bb
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-ixp4xx.inc
packages/distcc/files/no-man.patch
packages/distcc/distcc_2.18.3.bb
Diffs:
#
# mt diff -r728b58626c50e060bf71960029afce111427d6a0 -r2e62684434bad8e7a1ee7889de6b7bd78e7a5331
#
#
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.23.8"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.23.12"
#
# rename "packages/linux/linux-ixp4xx_2.6.23.8.bb"
# to "packages/linux/linux-ixp4xx_2.6.23.12.bb"
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [11acb028456fb05345111447a0655b656a67d690]
# to [6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22]
#
# patch "packages/linux/linux-ixp4xx.inc"
# from [104c898701b243728e14a24a5ac89d50ede467ad]
# to [22f02122239bf39a17155973a510c77a0e4d9de9]
#
# patch "packages/linux/linux-ixp4xx_2.6.23.12.bb"
# from [5072d1cda9fcc89b0db1894b9225812ec971acc9]
# to [91f144590f8e37b3d4894d7feebebb9a022be434]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 11acb028456fb05345111447a0655b656a67d690
+++ conf/distro/include/sane-srcrevs.inc 6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22
@@ -42,7 +42,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-libxosd ?= "627"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "927"
+SRCREV_pn-linux-ixp4xx ?= "957"
SRCREV_pn-linux-openmoko ?= "3238"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
============================================================
--- packages/linux/linux-ixp4xx.inc 104c898701b243728e14a24a5ac89d50ede467ad
+++ packages/linux/linux-ixp4xx.inc 22f02122239bf39a17155973a510c77a0e4d9de9
@@ -1,9 +1,9 @@ COMPATIBLE_HOST = 'arm.*-linux.*'
# linux-ixp4xx.inc
#
DESCRIPTION = "Linux 2.6.x kernel for IXP4xx devices"
COMPATIBLE_HOST = 'arm.*-linux.*'
-COMPATIBLE_MACHINE = '(ixp4xx|nslu2)'
+COMPATIBLE_MACHINE = '(ixp4xx|nslu2|syhl1)'
# To specify the console set KERNEL_CONSOLE in the .bb file.
============================================================
--- packages/linux/linux-ixp4xx_2.6.23.8.bb 5072d1cda9fcc89b0db1894b9225812ec971acc9
+++ packages/linux/linux-ixp4xx_2.6.23.12.bb 91f144590f8e37b3d4894d7feebebb9a022be434
@@ -6,13 +6,13 @@ VANILLA_VERSION = "2.6.23"
require linux-ixp4xx.inc
VANILLA_VERSION = "2.6.23"
-KERNEL_RELEASE = "2.6.23.8"
+KERNEL_RELEASE = "2.6.23.12"
# If you use a rc, you will need to use this:
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r1"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
@@ -21,11 +21,25 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}
S = "${WORKDIR}/linux-${VANILLA_VERSION}"
-do_prepatch() {
+# Apply the patches from the nslu2-linux project (after the patches in SRC_URI)
+do_postpatch() {
+ # Move away OE patches which have been already applied.
+ mv ${S}/patches ${S}/patches.oe
+ mv .pc .pc.oe
+
+ # Move the NSLU2 patches in place for quilt and apply them.
mv ${WORKDIR}/${VANILLA_VERSION} ${S}/patches && cd ${S} && quilt push -av
- mv patches patches.ixp4xx
- mv .pc .pc.old
+
+ # Store the NSLU2 patches
+ mv ${S}/patches ${S}/patches.ixp4xx
+ mv .pc .pc.ixp4xx
+
+ # And move back the OE patches
+ mv ${S}/patches.oe ${S}/patches
+ mv .pc.oe .pc
+
+ # Copy the defconfig into ${WORKDIR}
mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig
}
+addtask postpatch after do_patch before do_configure
-addtask prepatch after do_unpack before do_patch
#
# mt diff -rc22898d69793df7ecf7b5bb1e62791c4780023ab -r2e62684434bad8e7a1ee7889de6b7bd78e7a5331
#
#
#
# add_file "packages/distcc/files/no-man.patch"
# content [d340b667a5cb5703952649cdcc5321e6e14dea85]
#
# patch "packages/distcc/distcc_2.18.3.bb"
# from [980168c7626a06af4ee3c091da786c662f16fad8]
# to [761cc7f2560dbb4f9a2c2717f0b21dd831649fb3]
#
============================================================
--- packages/distcc/files/no-man.patch d340b667a5cb5703952649cdcc5321e6e14dea85
+++ packages/distcc/files/no-man.patch d340b667a5cb5703952649cdcc5321e6e14dea85
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.in 2008-01-06 16:44:45.696595605 +0100
++++ distcc-2.18.3/Makefile.in 2008-01-06 16:44:56.879181132 +0100
+@@ -556,7 +556,7 @@
+ # install-sh can't handle multiple arguments, but we don't need any
+ # tricky features so mkinstalldirs and cp will do
+
+-install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@
++install: showpaths install-doc install-programs install-example @INSTALL_GNOME@
+
+ install-programs: $(bin_PROGRAMS)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
============================================================
--- packages/distcc/distcc_2.18.3.bb 980168c7626a06af4ee3c091da786c662f16fad8
+++ packages/distcc/distcc_2.18.3.bb 761cc7f2560dbb4f9a2c2717f0b21dd831649fb3
@@ -1,15 +1,16 @@ LICENSE = "GPLv2"
DESCRIPTION = "distcc is a parallel build system that distributes \
compilation of C/C++/ObjC code across machines on a network."
SECTION = "devel"
LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
DEPENDS = "avahi gtk+"
RRECOMMENDS = "avahi-daemon"
SRC_URI = "http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 \
file://distcc-avahi.patch;patch=1 \
- file://default \
+ file://no-man.patch;patch=1 \
+ file://default \
file://distcc"
inherit autotools pkgconfig update-rc.d
@@ -21,8 +22,10 @@ do_install_append() {
do_install_append() {
install -d ${D}${sysconfdir}/init.d/
install -d ${D}${sysconfdir}/default
+ install -d ${D}${sysconfdir}/distcc
install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
+ echo "+zeroconf" > ${D}${sysconfdir}/distcc/hosts
}
PACKAGES += "distcc-distmon-gnome"
@@ -31,5 +34,11 @@ FILES_${PN} = " ${sysconfdir} \
${bindir}/distcc \
${bindir}/distccd \
${bindir}/distccmon-text"
+
+CONFFILES_${PN} += "${sysconfdir}/default/distcc \
+ ${sysconfdir}/distcc/hosts \
+ ${sysconfdir}/init.d/distcc \
+ "
+
FILES_distcc-distmon-gnome = " ${bindir}/distccmon-gnome \
${datadir}/distcc"
More information about the Openembedded-commits
mailing list