summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/slugos.conf2
-rw-r--r--packages/expat/expat_1.95.6.bb3
-rw-r--r--packages/expat/expat_1.95.7.bb1
-rw-r--r--packages/gdbm/gdbm-native_1.8.3.bb4
-rw-r--r--packages/gdbm/gdbm_1.8.3.bb4
-rw-r--r--packages/libaal/libaal_1.0.4.bb5
-rw-r--r--packages/libexif/libexif_0.6.9.bb9
-rw-r--r--packages/linux/nslu2-kernel_2.6.14.4.bb (renamed from packages/linux/nslu2-kernel_2.6.14.3.bb)2
-rw-r--r--packages/meta/slugos-packages.bb2
-rw-r--r--packages/pcre/pcre_4.4.bb7
10 files changed, 15 insertions, 24 deletions
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/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 () {
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/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
}
diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb
index e8956bd7d4..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 <jbowler@acm.org>"
@@ -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
}
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 <epronk@muftor.com>"
+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
}
diff --git a/packages/linux/nslu2-kernel_2.6.14.3.bb b/packages/linux/nslu2-kernel_2.6.14.4.bb
index 26ff0b76ce..823a8b9b1c 100644
--- a/packages/linux/nslu2-kernel_2.6.14.3.bb
+++ b/packages/linux/nslu2-kernel_2.6.14.4.bb
@@ -8,7 +8,7 @@ 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}"
+PR = "r0.${PR_CONFIG}"
include nslu2-kernel.inc
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 \
"
diff --git a/packages/pcre/pcre_4.4.bb b/packages/pcre/pcre_4.4.bb
index 612d76d835..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}"
@@ -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*"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 00:08:55 +0000