summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-09-04 09:32:14 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-09-04 09:32:14 +0000
commitcde908c37564b6812bcc09ea8ae569e41ca237fe (patch)
treea1b4010d5b8821401455fb51444cffa7d96adeaf
parent4831d5f3ed012aa3f82c95f20e3da61ea37be1df (diff)
downloadopenembedded-core-cde908c37564b6812bcc09ea8ae569e41ca237fe.tar.gz
openembedded-core-cde908c37564b6812bcc09ea8ae569e41ca237fe.tar.bz2
openembedded-core-cde908c37564b6812bcc09ea8ae569e41ca237fe.tar.xz
openembedded-core-cde908c37564b6812bcc09ea8ae569e41ca237fe.zip
glibc: do not package /usr/include/scsi as it is in libc-linux-headers-dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2683 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/glibc/glibc-package.bbclass3
-rw-r--r--meta/packages/glibc/glibc_2.3.5+cvs20050627.bb2
-rw-r--r--meta/packages/glibc/glibc_2.4.bb2
-rw-r--r--meta/packages/glibc/glibc_2.5.bb2
-rw-r--r--meta/packages/glibc/glibc_csl-2005q3-2.bb2
5 files changed, 7 insertions, 4 deletions
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass
index c502a9cae..88493824b 100644
--- a/meta/packages/glibc/glibc-package.bbclass
+++ b/meta/packages/glibc/glibc-package.bbclass
@@ -87,6 +87,9 @@ do_install() {
done
fi
rm -f ${D}/etc/rpc
+ rm -f ${D}${includedir}/scsi/sg.h
+ rm -f ${D}${includedir}/scsi/scsi_ioctl.h
+ rm -f ${D}${includedir}/scsi/scsi.h
}
TMP_LOCALE="/tmp/locale${libdir}/locale"
diff --git a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
index 2d29d95b3..619f8ecde 100644
--- a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -6,7 +6,7 @@ PRIORITY = "required"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
SRCDATE = "20050627"
-PR = "r3"
+PR = "r4"
GLIBC_ADDONS ?= "ports,linuxthreads"
GLIBC_EXTRA_OECONF ?= ""
diff --git a/meta/packages/glibc/glibc_2.4.bb b/meta/packages/glibc/glibc_2.4.bb
index fe8abe6c5..73d1a4b13 100644
--- a/meta/packages/glibc/glibc_2.4.bb
+++ b/meta/packages/glibc/glibc_2.4.bb
@@ -4,7 +4,7 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "required"
# DEFAULT_PREFERENCE = "-1"
-PR = "r10"
+PR = "r11"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
diff --git a/meta/packages/glibc/glibc_2.5.bb b/meta/packages/glibc/glibc_2.5.bb
index 24a91f5b0..74a7d8664 100644
--- a/meta/packages/glibc/glibc_2.5.bb
+++ b/meta/packages/glibc/glibc_2.5.bb
@@ -1,6 +1,6 @@
require glibc.inc
-PR = "r4"
+PR = "r5"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
diff --git a/meta/packages/glibc/glibc_csl-2005q3-2.bb b/meta/packages/glibc/glibc_csl-2005q3-2.bb
index ac6bc9f26..92866a4ad 100644
--- a/meta/packages/glibc/glibc_csl-2005q3-2.bb
+++ b/meta/packages/glibc/glibc_csl-2005q3-2.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
PRIORITY = "required"
# DEFAULT_PREFERENCE = "-1"
PV = "2.3.6+csl-arm-2005q3-2"
-PR = "r10"
+PR = "r11"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"