summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/binconfig.bbclass4
-rw-r--r--conf/checksums.ini76
-rw-r--r--packages/dmidecode/dmidecode_2.9.bb17
-rw-r--r--packages/gdb/gdb.inc5
-rw-r--r--packages/gdb/gdb_6.3.bb2
-rw-r--r--packages/gdb/gdb_6.4.bb2
-rw-r--r--packages/gdb/gdb_6.6.bb2
-rw-r--r--packages/gdb/gdb_6.7.1.bb2
-rw-r--r--packages/gdb/gdb_6.8.bb2
-rw-r--r--packages/glibc/files/etc/ld.so.conf2
-rw-r--r--packages/glibc/glibc-package.bbclass6
-rw-r--r--packages/glibc/glibc_2.2.5.bb2
-rw-r--r--packages/glibc/glibc_2.3.2+cvs20040726.bb2
-rw-r--r--packages/glibc/glibc_2.3.2.bb2
-rw-r--r--packages/glibc/glibc_2.3.3+cvs20041128.bb2
-rw-r--r--packages/glibc/glibc_2.3.3+cvs20050221.bb2
-rw-r--r--packages/glibc/glibc_2.3.3+cvs20050420.bb2
-rw-r--r--packages/glibc/glibc_2.3.3.bb2
-rw-r--r--packages/glibc/glibc_2.3.5+cvs20050627.bb2
-rw-r--r--packages/glibc/glibc_2.3.6.bb2
-rw-r--r--packages/glibc/glibc_2.4.bb2
-rw-r--r--packages/glibc/glibc_2.5.bb2
-rw-r--r--packages/glibc/glibc_2.6.1.bb2
-rw-r--r--packages/glibc/glibc_2.7.bb2
-rw-r--r--packages/meta/slugos-packages.bb2
-rw-r--r--packages/perl/perl-native_5.8.8.bb6
26 files changed, 128 insertions, 26 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 6c2c32a970..5789903178 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -11,8 +11,8 @@ def get_binconfig_mangle(d):
s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
- s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote
- s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote
+ s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
+ s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 2e56e1cf4b..dc7e678002 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1290,6 +1290,10 @@ sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b
md5=5afcef5d6047f14cd5f65d2fdbd86fb2
sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
+[ftp://ftp.us.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
+md5=5afcef5d6047f14cd5f65d2fdbd86fb2
+sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
+
[ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.9.tar.gz]
md5=2dd8ad238abcbab478db690085554d90
sha256=a9d7ac67598b2b004a53a9e70592e0f274d3c8731ed9395ed704fd0259f0c0af
@@ -2866,6 +2870,10 @@ sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
md5=14d2853df66054f83d73f7601bc60c8b
sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
+[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.39-1.diff.gz]
+md5=14d2853df66054f83d73f7601bc60c8b
+sha256=51e9b659b480d59ca3bb48ac1e4701d3b23c1efde15cf02c1904b43af6690fad
+
[ftp://ftp.debian.org/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
md5=2d29a68f8fb75b3bed7a18f3d0a002bb
sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
@@ -2874,6 +2882,10 @@ sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
md5=2d29a68f8fb75b3bed7a18f3d0a002bb
sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
+[ftp://ftp.us.debian.org/debian/pool/main/d/diffstat/diffstat_1.39.orig.tar.gz]
+md5=2d29a68f8fb75b3bed7a18f3d0a002bb
+sha256=e19f52cde20094ce20a1edee019ae7715bc1e8beca62ec4989a3da626ba9898a
+
[ftp://ftp.gnu.org/gnu/diffutils/diffutils-2.8.1.tar.gz]
md5=71f9c5ae19b60608f6c7f162da86a428
sha256=c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a
@@ -2910,6 +2922,10 @@ sha256=57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
md5=c94091de014b3aaf037d3d0f398d36c2
sha256=d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3
+[http://savannah.nongnu.org/download/dmidecode/dmidecode-2.9.tar.bz2]
+md5=3dac4b1817012ffebd78671473d8f56c
+sha256=888eb2c25bdcef5ee34c38cd5cb0f491d7dd82029dc0f4ae96183a0088a5e015
+
[http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.2.tar.bz2]
md5=d80acad88411e7944b9b085463d53302
sha256=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
@@ -3482,6 +3498,10 @@ sha256=2cbf95aef9e3f9a32b6859ae35723eaa76b5ed483ddaa654cf627d1eacdea5fa
md5=9441c981bfd4e521abcd5d93385f71d8
sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
+[ftp://ftp.us.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.9.6.tar.gz]
+md5=9441c981bfd4e521abcd5d93385f71d8
+sha256=06c2772ae6e446227f6798ad8994fcdb1fe64385bc83a34f7e29fd8af2e4f5da
+
[ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
md5=1c5a2ea659680bdd1e238d7828a857a7
sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
@@ -4610,6 +4630,10 @@ sha256=9b2e12bb1eafb55ab2e5a868532b8e6ec39216c66c25b8998d7474bc4d4eb529
md5=11cf6d3fc86dbe0890b8d00372eb6286
sha256=3ded3a3c3ba2cf02d72479a5cc0829c7c261a9d0934e49a79233de9fa276ec22
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.7.tar.bz2]
+md5=065c5952b439deba40083ccd67bcc8f7
+sha256=4224a522ac4ee0fd89eb337e7505e280dfb05e2fe1ad44339ba8874081c0451a
+
[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.4.tar.bz2]
md5=e2d892b40d654c523ab26a26b7dd86a1
sha256=2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977
@@ -4622,6 +4646,10 @@ sha256=de77e49e0beee6061d4c6e480f322566ba25d4e5e018c456a18ea4a8da5c0ede
md5=503f1315afd808728ebaa75b3d87a7d9
sha256=67c98ca1299f5f25eaece256d033e0e63bcf6876b920ca62a1fe61ac62c5c451
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-2.7.tar.bz2]
+md5=226809992fb1f3dc6ea23e0f26952ea4
+sha256=07de78810a5320d696792b67131c4cf3d6654aee015a6b74820d66fb00799000
+
[ftp://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.2.5.tar.gz]
md5=c766a79a51668d7fa33f175a249655b4
sha256=c027824ee6593a838e0883bdd4bf8bd455b3dcf4ff0aa77fe82452819d882f47
@@ -4646,6 +4674,10 @@ sha256=80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
md5=53d88ca624642dd267752ccce77b19d0
sha256=d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
+[ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-2.7.tar.bz2]
+md5=eaeb8527b8fa286c2d887157214f9998
+sha256=3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
+
[ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-2.8.4.tar.bz2]
md5=952cdde2d6aef201c528d431036d71e1
sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
@@ -7078,6 +7110,10 @@ sha256=0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97
md5=007ff9e08e26504f5c28462d7bbdaa3e
sha256=c682a23faf732203a7de9b82ffb736396e5948e000ab10c1a42b0e936b6cc329
+[http://downloads.sourceforge.net/ivman/ivman-0.6.14.tar.bz2]
+md5=ebef12559268e2c5ea932cbb5aaa789e
+sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
+
[http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2]
md5=e3013bb1e287b495b0668f4b6e2887c7
sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a
@@ -10714,6 +10750,10 @@ sha256=25cba395022c878cf0323da5b2b4aba1cca03001311a4e2d7632d6a199806294
md5=4d0f89a23f77e22f1671a77bf0898955
sha256=2a786e03611a53c7f6263db446c0c9ef76e94bcf930b0b5867cc6a9c19653074
+[http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.4.tar.bz2]
+md5=35394bf3f746a57fba624dba52fdbba3
+sha256=6f9a3cc70d27704ee8e4ff01d5d69c974b059fd7e470172b68cfa477c7caf8e3
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkfontdir-X11R7.0-1.0.1.tar.bz2]
md5=29e6e5e8e7a29ed49abf33af192693cb
sha256=409f2fdfd87b5185ca651197c1d1facc22619bc1399bfb8dda8fda1fbb6205b2
@@ -10722,6 +10762,10 @@ sha256=409f2fdfd87b5185ca651197c1d1facc22619bc1399bfb8dda8fda1fbb6205b2
md5=384ee10787c455c520bcf031989de6f3
sha256=94c4ab96ad858524b64864482f5623bd18f844b98788d7d4be1f8065a4f13a0d
+[http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.5.tar.bz2]
+md5=5e6e210b70adfef1264b0212aab1f758
+sha256=f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkfontscale-X11R7.0-1.0.1.tar.bz2]
md5=75bbd1dc425849e415a60afd9e74d2ff
sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2
@@ -11134,6 +11178,10 @@ sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
md5=4e4582ed5f84fa074137c1a7ee39a689
sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
+[ftp://ftp.us.debian.org/debian/pool/main/n/netbase/netbase_4.21.tar.gz]
+md5=4e4582ed5f84fa074137c1a7ee39a689
+sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
+
[http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
@@ -12142,6 +12190,10 @@ sha256=63ed71d9b9c0f0e1283a5345f27e7e95f71a2cda8bab4150e2a4937cd8834b5d
md5=da0da7ed1689469b45c8d62fa2dfb204
sha256=25b84792473fa17d118e69b588f32fe940d13a01c3b3db89290ce6516ad01b2e
+[http://alioth.debian.org/frs/download.php/2247/pmount-0.9.17.tar.gz]
+md5=24a676bf495bec367b2d971cdca1c54c
+sha256=2632d931b5732eb1d0de7a2e2d92c75d64412438958ee96dceb4443e4fc2a62f
+
[http://downloads.sourceforge.net/gakusei/pobox-1.2.5.tar.bz2]
md5=d1c988c2ac06d3111f80d59d30bb8bbb
sha256=73bbc333d2a51d0e1cd73030012f2727ac26f5b1d41333994b01a47486fc16db
@@ -13686,6 +13738,10 @@ sha256=96667a84cd8c7af103ca07fe6b41f7c1494a0ab7300335f7ab18ab49c3203e37
md5=2b53542095a35a8a5731164118643883
sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
+[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.0.4.tar.bz2]
+md5=6fab3bb176be9e510c5613d054ef1ca4
+sha256=9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/setxkbmap-X11R7.0-1.0.1.tar.bz2]
md5=28b141ab0b1c44a5e90d31ad73bd1078
sha256=4d710b17c5440518b43d3d1f7cbcb78a62c72f25e48a1b385a0ae3872ec8b40b
@@ -13966,6 +14022,10 @@ sha256=b5817b8629f89e16ba88e1c62dce0321978f3aea038aa77cb61a1ff7fa3e0dbb
md5=d69c74ab8e2d7664a48a09773450dd27
sha256=59e2b9b2244c169c6580cbfffaf5e2bd2f453753f879036487ec6ed116cf851b
+[http://dev.gentoo.org/~spock/projects/gensplash/archive/splashutils-1.5.4.2.tar.bz2]
+md5=00dce0efb5e6389cacbf15c62d18e413
+sha256=05265dbc948a690dc5b5710da23eb7093fa4eaabbfebd58463a2be4ab9b848b4
+
[http://www.hwaci.com/sw/sqlite/sqlite-2.8.15.tar.gz]
md5=0afa73e107bd106031d046c8ca6a94ab
sha256=8ba158121f3b20b852bd4dae9c32b5b86a6807a5deebb57f07f667a09672ea4c
@@ -16198,6 +16258,10 @@ sha256=7a17d709206ef881d1331c55c507f3d74f8d111060b6beae4152c92ee4b45dc5
md5=1fbdd5e9b5508b032c0102f72d1e555c
sha256=060493a9dcad81e8912381d2a8d14a3e32a34414296a089756868f3442103c8c
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nsc-2.8.3.tar.bz2]
+md5=f3ffacdc9f19e00b66bdff71b6df9b4e
+sha256=e5c5a2021877b8975bee39c06096316324e04f1eac5261bc882b96353a8b1839
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-nsc-X11R7.0-2.7.6.5.tar.bz2]
md5=ab16611b3ec7d21503b16b0a31addae0
sha256=1f88d5c79cfa34230ed8a9079e6b7df194fce219909b6f7cc232c6511000839a
@@ -16270,6 +16334,10 @@ sha256=6723b5b7e9ea5b3aebcbbaeaca59790e6a9ab6a7d5324c671454e426854aef3f
md5=559b7eeeb598b38afeb1542db6b48a0a
sha256=eab737423bfd3ecf38ee4a8d4bed86c363bb023ece283a7d515afaa1a11a394a
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.0.tar.bz2]
+md5=331d432dccccca91ec7da39ff6bf1218
+sha256=bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40
+
[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.9.3.tar.bz2]
md5=e35d817fa4ee7beb6cd5aa744b9c0783
sha256=898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6
@@ -16434,6 +16502,10 @@ sha256=6444f1b61a53b9ea89551d95d32bcf98d4d018d0d3ff9c34626c5c24d1b60507
md5=eaf1ce9fa23363799140602afaa10f37
sha256=1971fd356ba54204c3611edb9144c43c25c21167a5fa5ee725d3f2e3f9864fa9
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.1.tar.bz2]
+md5=a5e1f2539b82206e411c3647f10c425f
+sha256=91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
md5=4df79349e26add4c23f6be8bec347ad4
sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -16882,6 +16954,10 @@ sha256=6a079872319ac7934578cace787f4f89ea87258f6dd8b33e5b4359be1256e9a3
md5=cc0d64e90eab0b90b38355e841824588
sha256=05c269e322ed1ef54b8a32883c8676f46330ec70d85b0a158dbefc2b0e91ceb8
+[http://xorg.freedesktop.org/releases/individual/app/xlsfonts-1.0.2.tar.bz2]
+md5=28958248590ff60ecd70e8f590d977b7
+sha256=cc6e519b783b082a2fe4cd06ea5b3693ee6bdb23f4b36e7a72753c524ef5111c
+
[http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlsfonts-X11R7.0-1.0.1.tar.bz2]
md5=e8681e5671e7f01922ce6c8f2327e602
sha256=1f8d23d5f7dac0f06bc6c6fe6ed7d8e620fe1b0057654da314e24f7c6faefc6f
diff --git a/packages/dmidecode/dmidecode_2.9.bb b/packages/dmidecode/dmidecode_2.9.bb
new file mode 100644
index 0000000000..cc46524799
--- /dev/null
+++ b/packages/dmidecode/dmidecode_2.9.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "DMI (Desktop Management Interface) table related utilities"
+HOMEPAGE = "http://www.nongnu.org/dmidecode/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
+
+do_unpack_extra() {
+ sed -i \
+ -e '/^prefix/s:/usr/local:/usr:' \
+ Makefile
+}
+addtask unpack_extra after do_unpack before do_patch
+
+do_install() {
+ oe_runmake DESTDIR="${D}" install
+}
diff --git a/packages/gdb/gdb.inc b/packages/gdb/gdb.inc
index 8e7121bd49..77a9ca6a3e 100644
--- a/packages/gdb/gdb.inc
+++ b/packages/gdb/gdb.inc
@@ -29,6 +29,11 @@ do_configure () {
# override this function to avoid the autoconf/automake/aclocal/autoheader
# calls for now
(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+
+ # Remove duplicate spaces to work around configure complaining about
+ # changed LDFLAGS.
+ LDFLAGS=$(echo "${LDFLAGS}" | sed "s/ / /")
+
CPPFLAGS="" oe_runconf
}
diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb
index 05d4565fc9..5513d348d0 100644
--- a/packages/gdb/gdb_6.3.bb
+++ b/packages/gdb/gdb_6.3.bb
@@ -1,3 +1,3 @@
require gdb.inc
-FILE_PR = "r3"
+FILE_PR = "r4"
diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb
index 06d012903b..134c38426d 100644
--- a/packages/gdb/gdb_6.4.bb
+++ b/packages/gdb/gdb_6.4.bb
@@ -1,3 +1,3 @@
require gdb.inc
-FILE_PR = "r1" \ No newline at end of file
+FILE_PR = "r2"
diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb
index 990429056f..db1a89b706 100644
--- a/packages/gdb/gdb_6.6.bb
+++ b/packages/gdb/gdb_6.6.bb
@@ -1,5 +1,5 @@
require gdb.inc
-FILE_PR = "r4"
+FILE_PR = "r5"
SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0"
diff --git a/packages/gdb/gdb_6.7.1.bb b/packages/gdb/gdb_6.7.1.bb
index a411974b15..167c415dde 100644
--- a/packages/gdb/gdb_6.7.1.bb
+++ b/packages/gdb/gdb_6.7.1.bb
@@ -1,5 +1,7 @@
require gdb.inc
+FILE_PR = "r1"
+
DEFAULT_PREFERENCE_avr32 = "99"
SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
S_avr32 = "${WORKDIR}/gdb-6.7.1.atmel.1.0.3"
diff --git a/packages/gdb/gdb_6.8.bb b/packages/gdb/gdb_6.8.bb
index 832c40b97d..134c38426d 100644
--- a/packages/gdb/gdb_6.8.bb
+++ b/packages/gdb/gdb_6.8.bb
@@ -1,3 +1,3 @@
require gdb.inc
-FILE_PR = "r1"
+FILE_PR = "r2"
diff --git a/packages/glibc/files/etc/ld.so.conf b/packages/glibc/files/etc/ld.so.conf
deleted file mode 100644
index dfa65edb85..0000000000
--- a/packages/glibc/files/etc/ld.so.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/local/lib
-/usr/X11R6/lib
diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass
index 43a64d8af1..e982a24eb2 100644
--- a/packages/glibc/glibc-package.bbclass
+++ b/packages/glibc/glibc-package.bbclass
@@ -26,12 +26,15 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0"
# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
BINARY_LOCALE_ARCHES ?= "arm.*"
+# Set this to zero if you don't want ldconfig in the output package
+USE_LDCONFIG ?= "1"
+
PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile"
PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*"
libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*"
-FILES_${PN} = "${sysconfdir} ${libc_baselibs} /sbin/ldconfig ${libexecdir}/* ${datadir}/zoneinfo"
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_conditional('USE_LDCONFIG', '1', '/sbin/ldconfig', '', d)}"
FILES_ldd = "${bindir}/ldd"
FILES_libsegfault = "/lib/libSegFault*"
FILES_glibc-extra-nss = "/lib/libnss*"
@@ -70,7 +73,6 @@ do_install() {
h=`echo $r|sed -e's,\.x$,.h,'`
install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
done
- install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
install -d ${D}${libdir}/locale
make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
# get rid of some broken files...
diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb
index 907c39e1d1..e870f89abb 100644
--- a/packages/glibc/glibc_2.2.5.bb
+++ b/packages/glibc/glibc_2.2.5.bb
@@ -1,7 +1,7 @@
require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r18"
+FILE_PR = "r19"
DEFAULT_PREFERENCE_sh3 = "-99"
diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb
index 1fb000ef0c..774333f1e7 100644
--- a/packages/glibc/glibc_2.3.2+cvs20040726.bb
+++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb
@@ -3,7 +3,7 @@ require glibc.inc
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r29"
+FILE_PR = "r30"
GLIBC_ADDONS ?= "linuxthreads"
diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb
index fedc26e33c..6630161900 100644
--- a/packages/glibc/glibc_2.3.2.bb
+++ b/packages/glibc/glibc_2.3.2.bb
@@ -1,6 +1,6 @@
require glibc.inc
-FILE_PR = "r18"
+FILE_PR = "r19"
DEFAULT_PREFERENCE_sh3 = "-99"
diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb
index 92b57e55c4..e5feae6514 100644
--- a/packages/glibc/glibc_2.3.3+cvs20041128.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb
@@ -3,7 +3,7 @@ require glibc.inc
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r14"
+FILE_PR = "r15"
GLIBC_ADDONS ?= "linuxthreads"
diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb
index 97b09b4be5..fee5e5ab44 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050221.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb
@@ -3,7 +3,7 @@ require glibc.inc
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r14"
+FILE_PR = "r15"
GLIBC_ADDONS ?= "linuxthreads"
diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb
index 2564744755..137e8f4756 100644
--- a/packages/glibc/glibc_2.3.3+cvs20050420.bb
+++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb
@@ -5,7 +5,7 @@ DEFAULT_PREFERENCE_i586 = "0"
DEFAULT_PREFERENCE_sh3 = "-99"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-FILE_PR = "r12"
+FILE_PR = "r13"
GLIBC_ADDONS ?= "linuxthreads"
diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb
index f6bb562b28..9c97477ed8 100644
--- a/packages/glibc/glibc_2.3.3.bb
+++ b/packages/glibc/glibc_2.3.3.bb
@@ -1,6 +1,6 @@
require glibc.inc
-FILE_PR = "r15"
+FILE_PR = "r16"
DEFAULT_PREFERENCE_sh3 = "-99"
diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb
index c257e44bf7..3f767537b6 100644
--- a/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -2,7 +2,7 @@ require glibc.inc
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
SRCDATE = "20050627"
-FILE_PR = "r21"
+FILE_PR = "r22"
#Doesnt build for sh3
DEFAULT_PREFERENCE_sh3="-1"
diff --git a/packages/glibc/glibc_2.3.6.bb b/packages/glibc/glibc_2.3.6.bb
index a83402da1d..c55216c04f 100644
--- a/packages/glibc/glibc_2.3.6.bb
+++ b/packages/glibc/glibc_2.3.6.bb
@@ -1,6 +1,6 @@
require glibc.inc
-FILE_PR = "r3"
+FILE_PR = "r4"
#FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index c92d3e898c..3f32f0cb88 100644
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -1,6 +1,6 @@
require glibc.inc
-FILE_PR = "r19"
+FILE_PR = "r20"
#add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index b4ac5d5b76..d769bd7dee 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -1,5 +1,5 @@
require glibc.inc
-FILE_PR = "r17"
+FILE_PR = "r18"
ARM_INSTRUCTION_SET = "arm"
diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb
index 52b3f3c46b..0254811564 100644
--- a/packages/glibc/glibc_2.6.1.bb
+++ b/packages/glibc/glibc_2.6.1.bb
@@ -1,5 +1,5 @@
require glibc.inc
-FILE_PR = "r12"
+FILE_PR = "r13"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb
index 01cb215e98..c2e97af764 100644
--- a/packages/glibc/glibc_2.7.bb
+++ b/packages/glibc/glibc_2.7.bb
@@ -5,7 +5,7 @@ ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
-FILE_PR = "r7"
+FILE_PR = "r8"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 740677eddb..4fb7f6ddb6 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -92,6 +92,7 @@ SLUGOS_PACKAGES = "\
fuse \
gawk \
gcc \
+ gdb \
gdbm \
glib-2.0 \
gnu-config \
@@ -254,7 +255,6 @@ SLUGOS_BROKEN_PACKAGES = "\
ctorrent \
dsniff \
eciadsl \
- gdb \
gspcav1 \
linphone \
lirc-modules lirc \
diff --git a/packages/perl/perl-native_5.8.8.bb b/packages/perl/perl-native_5.8.8.bb
index 038177778f..3e215c56cf 100644
--- a/packages/perl/perl-native_5.8.8.bb
+++ b/packages/perl/perl-native_5.8.8.bb
@@ -55,8 +55,10 @@ do_configure () {
-Ud_csh \
-Uusesfio \
-Uusenm -des
- sed 's!${STAGING_DIR}/bin!${STAGING_BINDIR}!;
- s!${STAGING_DIR}/lib!${STAGING_LIBDIR}!' < config.sh > config.sh.new
+ sed "s!${STAGING_DIR}/bin!${STAGING_BINDIR}!;
+ s!${STAGING_DIR}/lib!${STAGING_LIBDIR}!;
+ s!^installbin=.*!installbin=\'${STAGING_BINDIR}\'!;
+ s!^installsitebin=.*!installsitebin=\'${STAGING_BINDIR}\'!" < config.sh > config.sh.new
mv config.sh.new config.sh
}
do_stage_append() {