From aba78b1052c271a8441b4b31cd1cd7abbdbe460d Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:03:25 +0000 Subject: nslu2-kernel: bug fix release 2.6.14.4 --- conf/distro/slugos.conf | 2 +- packages/linux/nslu2-kernel_2.6.14.3.bb | 42 --------------------------------- packages/linux/nslu2-kernel_2.6.14.4.bb | 42 +++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 packages/linux/nslu2-kernel_2.6.14.3.bb create mode 100644 packages/linux/nslu2-kernel_2.6.14.4.bb diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index ff4be92a8c..8f78064255 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -164,7 +164,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-kernel" -PREFERRED_VERSION_nslu2-kernel ?= "2.6.14.3" +PREFERRED_VERSION_nslu2-kernel ?= "2.6.14.4" # Built-in ethernet modules PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" diff --git a/packages/linux/nslu2-kernel_2.6.14.3.bb b/packages/linux/nslu2-kernel_2.6.14.3.bb deleted file mode 100644 index 26ff0b76ce..0000000000 --- a/packages/linux/nslu2-kernel_2.6.14.3.bb +++ /dev/null @@ -1,42 +0,0 @@ -# Kernel for NSLU2 -# -# Increment PR_CONFIG for changes to the nslu2-kernel specific -# defconfig (do *NOT* increment anything in here for changes -# to other kernel configs!) -PR_CONFIG = "0" -# -# Increment the number below (i.e. the digits after PR) when -# making changes within this file or for changes to the patches -# applied to the kernel. -PR = "r3.${PR_CONFIG}" - -include nslu2-kernel.inc - -# N2K_PATCHES - full list of patches to apply -N2K_PATCHES = "\ - file://90-ixp4xx-pci-le.patch;patch=1 \ - file://10-ixp4xx-copy-from.patch;patch=1 \ - file://10-ixp4xx-le.patch;patch=1 \ - file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ - file://15-ixp4xx-writesb-l-w.patch;patch=1 \ - file://18-ixp4xx-io-h-addr.patch;patch=1 \ - file://19-jffs2-force-be.patch;patch=1 \ - file://29-ipv4-route-c-spinlock.patch;patch=1 \ - file://30-i2c-x1205.patch;patch=1 \ - file://50-nslu2-arch.patch;patch=1 \ - file://55-nslu2-rtc.patch;patch=1 \ - file://60-nslu2-beeper.patch;patch=1 \ - file://70-nslu2-io.patch;patch=1 \ - file://75-nslu2-leds.patch;patch=1 \ - file://90-pegasus.patch;patch=1 \ - file://20-timer.patch;patch=1 \ - file://91-maclist.patch;patch=1 \ - file://92-nslu2-maclist.patch;patch=1 \ - file://anonymiser.patch;patch=1 \ -" - -# These options get added to the kernel command line, only put things -# specific to the bootstrap of *this* kernel in here - DISTRO specfic -# config must be in CMDLINE_ROOT (see the full definition of CMDLINE -# in nslu2-kernel.inc) -CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1" diff --git a/packages/linux/nslu2-kernel_2.6.14.4.bb b/packages/linux/nslu2-kernel_2.6.14.4.bb new file mode 100644 index 0000000000..823a8b9b1c --- /dev/null +++ b/packages/linux/nslu2-kernel_2.6.14.4.bb @@ -0,0 +1,42 @@ +# Kernel for NSLU2 +# +# Increment PR_CONFIG for changes to the nslu2-kernel specific +# defconfig (do *NOT* increment anything in here for changes +# to other kernel configs!) +PR_CONFIG = "0" +# +# Increment the number below (i.e. the digits after PR) when +# making changes within this file or for changes to the patches +# applied to the kernel. +PR = "r0.${PR_CONFIG}" + +include nslu2-kernel.inc + +# N2K_PATCHES - full list of patches to apply +N2K_PATCHES = "\ + file://90-ixp4xx-pci-le.patch;patch=1 \ + file://10-ixp4xx-copy-from.patch;patch=1 \ + file://10-ixp4xx-le.patch;patch=1 \ + file://10-mtdpart-redboot-fis-byteswap.patch;patch=1 \ + file://15-ixp4xx-writesb-l-w.patch;patch=1 \ + file://18-ixp4xx-io-h-addr.patch;patch=1 \ + file://19-jffs2-force-be.patch;patch=1 \ + file://29-ipv4-route-c-spinlock.patch;patch=1 \ + file://30-i2c-x1205.patch;patch=1 \ + file://50-nslu2-arch.patch;patch=1 \ + file://55-nslu2-rtc.patch;patch=1 \ + file://60-nslu2-beeper.patch;patch=1 \ + file://70-nslu2-io.patch;patch=1 \ + file://75-nslu2-leds.patch;patch=1 \ + file://90-pegasus.patch;patch=1 \ + file://20-timer.patch;patch=1 \ + file://91-maclist.patch;patch=1 \ + file://92-nslu2-maclist.patch;patch=1 \ + file://anonymiser.patch;patch=1 \ +" + +# These options get added to the kernel command line, only put things +# specific to the bootstrap of *this* kernel in here - DISTRO specfic +# config must be in CMDLINE_ROOT (see the full definition of CMDLINE +# in nslu2-kernel.inc) +CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1" -- cgit v1.2.3 From f972f14b83e8f3e6657a393921e2a01f3ca0a880 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:04:34 +0000 Subject: slugos-packages: move irssi to broken in slugos-packages.bb --- packages/meta/slugos-packages.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 7ce33122cb..2cc8f5878b 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -68,7 +68,6 @@ SLUGOS_PACKAGES = "\ ifupdown \ ipkg-utils \ iptables \ - irssi \ joe \ jpeg \ lcdproc \ @@ -159,6 +158,7 @@ SLUGOS_PACKAGES = "\ SLUGOS_BROKEN_PACKAGES = "\ groff \ icecast \ + irssi \ pvrusb2-mci \ watchdog \ " -- cgit v1.2.3 From 7d9264f7c63c0d82b12d036db240dbea53961cdf Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:06:23 +0000 Subject: pcre: change do_stage to autotools_stage_all in pcre 4.4 --- packages/pcre/pcre_4.4.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb index 612d76d835..f718ac0830 100644 --- a/packages/pcre/pcre_4.4.bb +++ b/packages/pcre/pcre_4.4.bb @@ -27,10 +27,7 @@ do_compile () { } do_stage () { - oe_libinstall -a -so libpcre ${STAGING_LIBDIR} - oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} - install -m 0644 pcre.h ${STAGING_INCDIR}/ - install -m 0644 pcreposix.h ${STAGING_INCDIR}/ + autotools_stage_all } FILES_${PN} = "${libdir}/lib*.so*" -- cgit v1.2.3 From d76fb0cb7153f7c656516f3de9d67baba90db19c Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:07:09 +0000 Subject: expat: change do_stage to use autotools_stage_all in expat 1.95.6 --- packages/expat/expat_1.95.6.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb index f597b3f18d..4782bcf6f6 100644 --- a/packages/expat/expat_1.95.6.bb +++ b/packages/expat/expat_1.95.6.bb @@ -9,8 +9,7 @@ inherit autotools export LTCC = "${CC}" do_stage () { - install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/ - oe_libinstall -so libexpat ${STAGING_LIBDIR}/ + autotools_stage_all } do_install () { -- cgit v1.2.3 From 2bfa1844ca3dad62ac9965f33a12dc6a87255b40 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:08:42 +0000 Subject: libaal: change do_stage to use autotools_stage_all in libaal 1.0.4 --- packages/libaal/libaal_1.0.4.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb index e8956bd7d4..992a3f1708 100644 --- a/packages/libaal/libaal_1.0.4.bb +++ b/packages/libaal/libaal_1.0.4.bb @@ -21,6 +21,5 @@ EXTRA_OECONF = "${DISABLE_LIBMINIMAL}" do_stage() { echo "NOTE: stage package ${PF} is: (${PN},${PV},${PR})" - autotools_stage_includes - oe_libinstall -a -so -C src ${PN} ${STAGING_LIBDIR} + autotools_stage_all } -- cgit v1.2.3 From 81fc868ff2c1f8d8ee29481bd369d4e992823f02 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:13:49 +0000 Subject: expat: bump pr in 1.95.7 libaal: bump pr in 1.0.4 pcre: bump pr in 4.4 --- packages/expat/expat_1.95.7.bb | 1 + packages/libaal/libaal_1.0.4.bb | 2 +- packages/pcre/pcre_4.4.bb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb index 95572ce84b..c3bbb8981b 100644 --- a/packages/expat/expat_1.95.7.bb +++ b/packages/expat/expat_1.95.7.bb @@ -2,6 +2,7 @@ SECTION = "libs" DESCRIPTION = "Jim Clarkes XML parser library." HOMEPAGE = "http://expat.sourceforge.net/" LICENSE = "MIT" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ file://autotools.patch;patch=1" diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb index 992a3f1708..d4a460c6da 100644 --- a/packages/libaal/libaal_1.0.4.bb +++ b/packages/libaal/libaal_1.0.4.bb @@ -1,7 +1,7 @@ # This is the support library for reiser4progs, required when # building that package. The libraries from this build must # be installed on the system to use the reiser4progs programs -PR = "r0" +PR = "r1" DESCRIPTION = "Library for user-level code accessing Reiser4 filesystems" HOMEPAGE = "http://www.namesys.com" MAINTAINER = "John Bowler " diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb index f718ac0830..3724f46f09 100644 --- a/packages/pcre/pcre_4.4.bb +++ b/packages/pcre/pcre_4.4.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r2" +PR = "r3" LICENSE = "BSD" SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2" S = "${WORKDIR}/pcre-${PV}" -- cgit v1.2.3 From 75683a076128230455bdef6cabe7c436be6c2215 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:20:13 +0000 Subject: libexif: change do_stage to use autotools_stage_all in libexif 0.6.9 --- packages/libexif/libexif_0.6.9.bb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb index bef386aaa1..c40edc4c95 100644 --- a/packages/libexif/libexif_0.6.9.bb +++ b/packages/libexif/libexif_0.6.9.bb @@ -3,17 +3,12 @@ HOMEPAGE = "http://sourceforge.net/projects/libexif" LICENSE = "LGPL" SECTION = "libs" MAINTAINER = "Eddy Pronk " +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" inherit autotools pkgconfig do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done + autotools_stage_all } -- cgit v1.2.3 From 9127d4721c6648fb6119ab3d280d62554ae51ec2 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Thu, 29 Dec 2005 02:24:01 +0000 Subject: gdbm: change do_stage to use autotools_stage_all in gdbm, gdbm-native 1.8.3 --- packages/gdbm/gdbm-native_1.8.3.bb | 4 ++-- packages/gdbm/gdbm_1.8.3.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/gdbm/gdbm-native_1.8.3.bb b/packages/gdbm/gdbm-native_1.8.3.bb index 3c99b28857..627a44fc2e 100644 --- a/packages/gdbm/gdbm-native_1.8.3.bb +++ b/packages/gdbm/gdbm-native_1.8.3.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gdbm/gdbm.html" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://makefile.patch;patch=1" @@ -11,6 +12,5 @@ S = "${WORKDIR}/gdbm-${PV}" inherit autotools native do_stage () { - oe_libinstall -so -a libgdbm ${STAGING_LIBDIR} - install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/ + autotools_stage_all } diff --git a/packages/gdbm/gdbm_1.8.3.bb b/packages/gdbm/gdbm_1.8.3.bb index 650a3079e7..ca956520a7 100644 --- a/packages/gdbm/gdbm_1.8.3.bb +++ b/packages/gdbm/gdbm_1.8.3.bb @@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gdbm/gdbm.html" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" +PR = "r1" SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ file://makefile.patch;patch=1" @@ -10,6 +11,5 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \ inherit autotools do_stage () { - oe_libinstall -so -a libgdbm ${STAGING_LIBDIR} - install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/ + autotools_stage_all } -- cgit v1.2.3