[oe-commits] org.oe.dev merge of '228193d507da8cea1fcf8c9e3c43ccb070860df0'

[koen commit]

merge of '228193d507da8cea1fcf8c9e3c43ccb070860df0'
     and '98155415179a9d159b94176f081aef69657bd2cd'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: ec004dc23e2690ed59a73642e532d4a4c1118679
ViewMTN: http://monotone.openembedded.org/revision/info/ec004dc23e2690ed59a73642e532d4a4c1118679
Files:
1
packages/apmd/apmd_3.2.2.bb
packages/squid/squid-native_2.6.STABLE14.bb
packages/squid/squid_2.6.STABLE14.bb
Diffs:

#
# mt diff -r228193d507da8cea1fcf8c9e3c43ccb070860df0 -rec004dc23e2690ed59a73642e532d4a4c1118679
#
# 
# 
# patch "packages/apmd/apmd_3.2.2.bb"
#  from [40a29924ea4530cc172b5f300d88c87e3b2adac2]
#    to [468e386d67d32dcf673ffd462940acdf206daeee]
# 
============================================================
--- packages/apmd/apmd_3.2.2.bb	40a29924ea4530cc172b5f300d88c87e3b2adac2
+++ packages/apmd/apmd_3.2.2.bb	468e386d67d32dcf673ffd462940acdf206daeee
@@ -5,7 +5,7 @@ PR = "r8"
 LICENSE = "GPL"
 PR = "r8"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
            file://debian.patch;patch=1 \
            file://workaround.patch;patch=1 \
            file://zaurus24.patch;patch=1 \


#
# mt diff -r98155415179a9d159b94176f081aef69657bd2cd -rec004dc23e2690ed59a73642e532d4a4c1118679
#
# 
# 
# add_file "packages/squid/squid-native_2.6.STABLE14.bb"
#  content [1169cadac256342674c3cd23becc516abb03b031]
# 
# patch "packages/squid/squid_2.6.STABLE14.bb"
#  from [5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f]
#    to [a3362ec5fbb758d23c416f5a20431fc5e27a6f40]
# 
============================================================
--- packages/squid/squid-native_2.6.STABLE14.bb	1169cadac256342674c3cd23becc516abb03b031
+++ packages/squid/squid-native_2.6.STABLE14.bb	1169cadac256342674c3cd23becc516abb03b031
@@ -0,0 +1,11 @@
+inherit native autotools
+
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-$PV}.tar.bz2"
+S = "${WORKDIR}/squid-${PV}"
+
+inherit native autotools
+
+do_stage() {
+        install -d ${STAGING_BINDIR_NATIVE}   
+        install -m 0755 src/cf_gen ${STAGING_BINDIR_NATIVE}/cf_gen
+}
============================================================
--- packages/squid/squid_2.6.STABLE14.bb	5aa7fbb4de7e6c5a481b693a5c5ae386e4433b0f
+++ packages/squid/squid_2.6.STABLE14.bb	a3362ec5fbb758d23c416f5a20431fc5e27a6f40
@@ -1,11 +1,23 @@ LICENSE = "GPLv2"
 DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"
 LICENSE = "GPLv2"
 
-DEPENDS = "aio"
+DEPENDS = "squid-native-${PV}"
 
-SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2"
+SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-${PV}.tar.bz2"
 
 inherit autotools
 
+EXTRA_OECONF = "--disable-epoll --disable-nls"
 
+do_configure_append() {
+   sed -i -e 's|./cf_gen |${STAGING_BINDIR_NATIVE}/cf_gen |g' src/Makefile
+}
 
+# this packages the languages better and saves some space, installs
+# English as errors default and the others in locale package
+
+FILES_${PN} += " ${datadir}/errors/English/* \
+                 ${datadir}/icons/* \
+                 ${datadir}/mib.txt"
+
+FILES_${PN}-locale += " ${datadir}/errors/* "