summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--bitbake-dev/lib/bb/fetch/wget.py25
-rw-r--r--bitbake/lib/bb/fetch/wget.py25
-rw-r--r--meta-moblin/packages/sreadahead/sreadahead_0.02.bb6
-rw-r--r--meta/classes/autotools.bbclass38
-rw-r--r--meta/classes/base.bbclass7
-rw-r--r--meta/classes/packaged-staging.bbclass3
-rw-r--r--meta/packages/drm/libdrm_2.4.0.bb1
-rw-r--r--meta/packages/drm/libdrm_git.bb2
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb2
-rw-r--r--meta/packages/packkagekit/files/no_validate.patch21
-rw-r--r--meta/packages/packkagekit/packagekit_0.3.8.bb9
-rw-r--r--meta/packages/pam/files/disable_crossbinary.patch34
-rw-r--r--meta/packages/pam/pam_1.0.2.bb5
-rw-r--r--meta/packages/policykit/policykit_0.9.bb2
-rw-r--r--meta/packages/syslinux/syslinux-installer-native_3.36.bb1
-rw-r--r--meta/packages/uuid/files/fixes.patch42
-rw-r--r--meta/packages/uuid/uuid_1.6.2.bb15
-rwxr-xr-xscripts/poky-autobuild-moblin8
19 files changed, 153 insertions, 94 deletions
diff --git a/.gitignore b/.gitignore
index b196971479..0b13ee1f57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
1*.pyc 1*.pyc
2build/conf/local.conf
2build/tmp/ 3build/tmp/
3sources/ 4sources/
4meta-moblin-internal 5meta-moblin-internal
diff --git a/bitbake-dev/lib/bb/fetch/wget.py b/bitbake-dev/lib/bb/fetch/wget.py
index 88193755d1..0008a28700 100644
--- a/bitbake-dev/lib/bb/fetch/wget.py
+++ b/bitbake-dev/lib/bb/fetch/wget.py
@@ -60,11 +60,30 @@ class Wget(Fetch):
60 else: 60 else:
61 fetchcmd = data.getVar("FETCHCOMMAND", d, 1) 61 fetchcmd = data.getVar("FETCHCOMMAND", d, 1)
62 62
63 uri = uri.split(";")[0]
64 uri_decoded = list(bb.decodeurl(uri))
65 uri_type = uri_decoded[0]
66 uri_host = uri_decoded[1]
67
63 bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri) 68 bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
64 fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0]) 69 fetchcmd = fetchcmd.replace("${URI}", uri)
65 fetchcmd = fetchcmd.replace("${FILE}", ud.basename) 70 fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
66 httpproxy = data.getVar("http_proxy", d, True) 71 httpproxy = None
67 ftpproxy = data.getVar("ftp_proxy", d, True) 72 ftpproxy = None
73 if uri_type == 'http':
74 httpproxy = data.getVar("HTTP_PROXY", d, True)
75 httpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split()
76 for p in httpproxy_ignore:
77 if uri_host.endswith(p):
78 httpproxy = None
79 break
80 if uri_type == 'ftp':
81 ftpproxy = data.getVar("FTP_PROXY", d, True)
82 ftpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split()
83 for p in ftpproxy_ignore:
84 if uri_host.endswith(p):
85 ftpproxy = None
86 break
68 if httpproxy: 87 if httpproxy:
69 fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd 88 fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd
70 if ftpproxy: 89 if ftpproxy:
diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py
index 88193755d1..0008a28700 100644
--- a/bitbake/lib/bb/fetch/wget.py
+++ b/bitbake/lib/bb/fetch/wget.py
@@ -60,11 +60,30 @@ class Wget(Fetch):
60 else: 60 else:
61 fetchcmd = data.getVar("FETCHCOMMAND", d, 1) 61 fetchcmd = data.getVar("FETCHCOMMAND", d, 1)
62 62
63 uri = uri.split(";")[0]
64 uri_decoded = list(bb.decodeurl(uri))
65 uri_type = uri_decoded[0]
66 uri_host = uri_decoded[1]
67
63 bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri) 68 bb.msg.note(1, bb.msg.domain.Fetcher, "fetch " + uri)
64 fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0]) 69 fetchcmd = fetchcmd.replace("${URI}", uri)
65 fetchcmd = fetchcmd.replace("${FILE}", ud.basename) 70 fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
66 httpproxy = data.getVar("http_proxy", d, True) 71 httpproxy = None
67 ftpproxy = data.getVar("ftp_proxy", d, True) 72 ftpproxy = None
73 if uri_type == 'http':
74 httpproxy = data.getVar("HTTP_PROXY", d, True)
75 httpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split()
76 for p in httpproxy_ignore:
77 if uri_host.endswith(p):
78 httpproxy = None
79 break
80 if uri_type == 'ftp':
81 ftpproxy = data.getVar("FTP_PROXY", d, True)
82 ftpproxy_ignore = (data.getVar("HTTP_PROXY_IGNORE", d, True) or "").split()
83 for p in ftpproxy_ignore:
84 if uri_host.endswith(p):
85 ftpproxy = None
86 break
68 if httpproxy: 87 if httpproxy:
69 fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd 88 fetchcmd = "http_proxy=" + httpproxy + " " + fetchcmd
70 if ftpproxy: 89 if ftpproxy:
diff --git a/meta-moblin/packages/sreadahead/sreadahead_0.02.bb b/meta-moblin/packages/sreadahead/sreadahead_0.02.bb
index ca89635776..1ca5f16557 100644
--- a/meta-moblin/packages/sreadahead/sreadahead_0.02.bb
+++ b/meta-moblin/packages/sreadahead/sreadahead_0.02.bb
@@ -14,6 +14,12 @@ SRC_URI = "http://www.moblin.org/sites/all/files/sreadahead-${PV}.tar.gz \
14 14
15CFLAGS_prepend = "-I ${S}/include " 15CFLAGS_prepend = "-I ${S}/include "
16 16
17#
18# Not compatible on arm due to the use of __sync_fetch_and_add
19# Would need to use a pthread mutex on arm
20#
21COMPATIBLE_HOST = "(i.86).*-linux"
22
17PACKAGES += "${PN}-generate" 23PACKAGES += "${PN}-generate"
18FILES_${PN} = "${base_sbindir}/sreadahead ${sysconfdir}/init.d/sreadahead.sh" 24FILES_${PN} = "${base_sbindir}/sreadahead ${sysconfdir}/init.d/sreadahead.sh"
19FILES_${PN}-generate = "${base_sbindir}/generate_filelist ${sysconfdir}/init.d/sreadahead-generate.sh" 25FILES_${PN}-generate = "${base_sbindir}/generate_filelist ${sysconfdir}/init.d/sreadahead-generate.sh"
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 83ab063376..365258f65f 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -175,6 +175,26 @@ autotools_stage_dir() {
175 fi 175 fi
176} 176}
177 177
178autotools_stage_libdir() {
179 from="$1"
180 to="$2"
181
182 olddir=`pwd`
183 cd $from
184 las=$(find . -name \*.la -type f)
185 cd $olddir
186 echo "Found la files: $las"
187 for i in $las
188 do
189 sed -e 's/^installed=yes$/installed=no/' \
190 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
191 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
192 -i $from/$i
193 done
194 autotools_stage_dir $from $to
195}
196
197
178autotools_stage_all() { 198autotools_stage_all() {
179 if [ "${INHIBIT_AUTO_STAGE}" = "1" ] 199 if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
180 then 200 then
@@ -193,19 +213,11 @@ autotools_stage_all() {
193 fi 213 fi
194 if [ -d ${STAGE_TEMP}/${libdir} ] 214 if [ -d ${STAGE_TEMP}/${libdir} ]
195 then 215 then
196 olddir=`pwd` 216 autotools_stage_libdir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
197 cd ${STAGE_TEMP}/${libdir} 217 fi
198 las=$(find . -name \*.la -type f) 218 if [ -d ${STAGE_TEMP}/${base_libdir} ]
199 cd $olddir 219 then
200 echo "Found la files: $las" 220 autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${layout_base_libdir}
201 for i in $las
202 do
203 sed -e 's/^installed=yes$/installed=no/' \
204 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
205 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
206 -i ${STAGE_TEMP}/${libdir}/$i
207 done
208 autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
209 fi 221 fi
210 rm -rf ${STAGE_TEMP}/${mandir} || true 222 rm -rf ${STAGE_TEMP}/${mandir} || true
211 rm -rf ${STAGE_TEMP}/${infodir} || true 223 rm -rf ${STAGE_TEMP}/${infodir} || true
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 1b70bfdd5f..76b21382f5 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -742,12 +742,9 @@ def generate_git_config(e):
742 742
743 f = open(gitconfig_path, 'w') 743 f = open(gitconfig_path, 'w')
744 f.write("[core]\n") 744 f.write("[core]\n")
745 ignore_count = 1 745 ignore_hosts = data.getVar('GIT_PROXY_IGNORE', e.data, True).split()
746 ignore_host = data.getVar('GIT_PROXY_IGNORE_1', e.data, True) 746 for ignore_host in ignore_hosts:
747 while (ignore_host):
748 f.write(" gitproxy = none for %s\n" % ignore_host) 747 f.write(" gitproxy = none for %s\n" % ignore_host)
749 ignore_count += 1
750 ignore_host = data.getVar('GIT_PROXY_IGNORE_%s' % ignore_count, e.data, True)
751 f.write(proxy_command) 748 f.write(proxy_command)
752 f.close 749 f.close
753 750
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 2497ac4d11..144087fedc 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -159,9 +159,8 @@ staging_helper () {
159 mkdir -p ${TMPDIR}${layout_libdir}/opkg/info/ 159 mkdir -p ${TMPDIR}${layout_libdir}/opkg/info/
160 fi 160 fi
161 if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then 161 if [ ! -e ${TMPDIR}${layout_libdir}/ipkg/ ]; then
162 mkdir -p ${TMPDIR}${layout_libdir}/opkg
163 cd ${TMPDIR}${layout_libdir}/ 162 cd ${TMPDIR}${layout_libdir}/
164 ln -sf opkg/ ipkg 163 ln -sf opkg/ ipkg || true
165 fi 164 fi
166} 165}
167 166
diff --git a/meta/packages/drm/libdrm_2.4.0.bb b/meta/packages/drm/libdrm_2.4.0.bb
index 9caf9b4bea..d5e716014f 100644
--- a/meta/packages/drm/libdrm_2.4.0.bb
+++ b/meta/packages/drm/libdrm_2.4.0.bb
@@ -2,6 +2,7 @@ SECTION = "x11/base"
2LICENSE = "MIT" 2LICENSE = "MIT"
3SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" 3SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
4PROVIDES = "drm" 4PROVIDES = "drm"
5DEPENDS = "libpthread-stubs"
5 6
6inherit autotools pkgconfig 7inherit autotools pkgconfig
7 8
diff --git a/meta/packages/drm/libdrm_git.bb b/meta/packages/drm/libdrm_git.bb
index e05e16bb04..27d913c8d7 100644
--- a/meta/packages/drm/libdrm_git.bb
+++ b/meta/packages/drm/libdrm_git.bb
@@ -5,6 +5,8 @@ PROVIDES = "drm"
5 5
6S = ${WORKDIR}/git 6S = ${WORKDIR}/git
7 7
8DEPENDS = "libpthread-stubs"
9
8PR = "r0" 10PR = "r0"
9PV = "2.4.0+git${SRCREV}" 11PV = "2.4.0+git${SRCREV}"
10 12
diff --git a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
index 4e4d372604..42644b59de 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
@@ -1,6 +1,6 @@
1require e2fsprogs.inc 1require e2fsprogs.inc
2 2
3PR = "r10" 3PR = "r11"
4 4
5S = "${WORKDIR}/e2fsprogs-${PV}" 5S = "${WORKDIR}/e2fsprogs-${PV}"
6 6
diff --git a/meta/packages/packkagekit/files/no_validate.patch b/meta/packages/packkagekit/files/no_validate.patch
new file mode 100644
index 0000000000..f987b567df
--- /dev/null
+++ b/meta/packages/packkagekit/files/no_validate.patch
@@ -0,0 +1,21 @@
1Index: PackageKit-0.3.8/configure.ac
2===================================================================
3--- PackageKit-0.3.8.orig/configure.ac 2008-11-04 21:37:17.000000000 +0000
4+++ PackageKit-0.3.8/configure.ac 2008-11-04 21:37:57.000000000 +0000
5@@ -451,11 +451,11 @@
6 polkit-grant >= $POLKIT_GRANT_REQUIRED)
7 AC_SUBST(POLKIT_CFLAGS)
8 AC_SUBST(POLKIT_LIBS)
9- AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
10- [polkit-policy-file-validate], [polkit-policy-file-validate])
11- if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
12- AC_MSG_ERROR([polkit-policy-file-validate not found])
13- fi
14+ #AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
15+ # [polkit-policy-file-validate], [polkit-policy-file-validate])
16+ #if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
17+ # AC_MSG_ERROR([polkit-policy-file-validate not found])
18+ #fi
19 AC_DEFINE(USE_SECURITY_POLKIT, 1, [if we should use PolicyKit])
20 elif test x$with_security_framework = xdummy; then
21 AC_DEFINE(USE_SECURITY_DUMMY, 1, [if we should use a dummy security framework])
diff --git a/meta/packages/packkagekit/packagekit_0.3.8.bb b/meta/packages/packkagekit/packagekit_0.3.8.bb
index ccac51c01f..6b44aeac7b 100644
--- a/meta/packages/packkagekit/packagekit_0.3.8.bb
+++ b/meta/packages/packkagekit/packagekit_0.3.8.bb
@@ -1,10 +1,11 @@
1HOMEPAGE = "http://www.packagekit.org/" 1HOMEPAGE = "http://www.packagekit.org/"
2PR = "r4" 2PR = "r6"
3 3
4SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz" 4SRC_URI = "http://www.packagekit.org/releases/PackageKit-0.3.8.tar.gz \
5 file://no_validate.patch;patch=1 "
5 6
6DEPENDS = "python polkit pam opkg-sdk" 7DEPENDS = "python polkit pam"
7EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local" 8EXTRA_OECONF = "--disable-qt --disable-tests --enable-yum --with-default-backend=yum --disable-local --with-security-framework=polkit --disable-gstreamer-plugin"
8 9
9S = "${WORKDIR}/PackageKit-${PV}" 10S = "${WORKDIR}/PackageKit-${PV}"
10 11
diff --git a/meta/packages/pam/files/disable_crossbinary.patch b/meta/packages/pam/files/disable_crossbinary.patch
new file mode 100644
index 0000000000..43359b08fe
--- /dev/null
+++ b/meta/packages/pam/files/disable_crossbinary.patch
@@ -0,0 +1,34 @@
1padout should be compiled using the native compiler but isn't.
2Disable this piece of documentation for now.
3
4RP
5
6Index: Linux-PAM-1.0.2/doc/specs/Makefile.am
7===================================================================
8--- Linux-PAM-1.0.2.orig/doc/specs/Makefile.am 2008-11-04 21:06:23.000000000 +0000
9+++ Linux-PAM-1.0.2/doc/specs/Makefile.am 2008-11-04 21:07:06.000000000 +0000
10@@ -2,21 +2,8 @@
11 # Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
12 #
13
14-CLEANFILES = draft-morgan-pam-current.txt *~
15+CLEANFILES = *~
16
17-EXTRA_DIST = draft-morgan-pam.raw std-agent-id.raw rfc86.0.txt
18+EXTRA_DIST = std-agent-id.raw rfc86.0.txt
19
20-draft-morgan-pam-current.txt: padout draft-morgan-pam.raw
21- ./padout < $(srcdir)/draft-morgan-pam.raw > draft-morgan-pam-current.txt
22-
23-AM_YFLAGS = -d
24-
25-BUILT_SOURCES = parse_y.h
26-
27-noinst_PROGRAMS = padout
28-
29-padout_SOURCES = parse_l.l parse_y.y
30-
31-padout_LDADD = @LEXLIB@
32-
33-doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt
34+doc_DATA = rfc86.0.txt
diff --git a/meta/packages/pam/pam_1.0.2.bb b/meta/packages/pam/pam_1.0.2.bb
index d894824d49..2a91414d7e 100644
--- a/meta/packages/pam/pam_1.0.2.bb
+++ b/meta/packages/pam/pam_1.0.2.bb
@@ -1,7 +1,8 @@
1HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/" 1HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/"
2PR = "r5" 2PR = "r7"
3 3
4SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2" 4SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2 \
5 file://disable_crossbinary.patch;patch=1 "
5 6
6EXTRA_OECONF = "--with-db-uniquename=_pam \ 7EXTRA_OECONF = "--with-db-uniquename=_pam \
7 --includedir=${includedir}/security \ 8 --includedir=${includedir}/security \
diff --git a/meta/packages/policykit/policykit_0.9.bb b/meta/packages/policykit/policykit_0.9.bb
index 26b9351c09..b2efd58328 100644
--- a/meta/packages/policykit/policykit_0.9.bb
+++ b/meta/packages/policykit/policykit_0.9.bb
@@ -4,7 +4,7 @@ PR = "r4"
4SRC_URI = "http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz" 4SRC_URI = "http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz"
5 5
6 6
7DEPENDS = "pam" 7DEPENDS = "pam expat dbus-glib"
8RDEPENDS = "pam" 8RDEPENDS = "pam"
9EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc" 9EXTRA_OECONF = "--with-authfw=pam --with-os-type=moblin --disable-man-pages --disable-gtk-doc"
10 10
diff --git a/meta/packages/syslinux/syslinux-installer-native_3.36.bb b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
index 88bc37a1d3..cc61693be0 100644
--- a/meta/packages/syslinux/syslinux-installer-native_3.36.bb
+++ b/meta/packages/syslinux/syslinux-installer-native_3.36.bb
@@ -5,6 +5,7 @@ DESCRIPTION = "A multi-purpose linux bootloader"
5HOMEPAGE = "http://syslinux.zytor.com/" 5HOMEPAGE = "http://syslinux.zytor.com/"
6LICENSE = "GPL" 6LICENSE = "GPL"
7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " 7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
8DEPENDS = "nasm-native"
8 9
9S = "${WORKDIR}/syslinux-${PV}" 10S = "${WORKDIR}/syslinux-${PV}"
10STAGE_TEMP = "${WORKDIR}/stage_temp" 11STAGE_TEMP = "${WORKDIR}/stage_temp"
diff --git a/meta/packages/uuid/files/fixes.patch b/meta/packages/uuid/files/fixes.patch
deleted file mode 100644
index 8a792c7239..0000000000
--- a/meta/packages/uuid/files/fixes.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Index: uuid-1.6.2/Makefile.in
2===================================================================
3--- uuid-1.6.2.orig/Makefile.in 2008-10-29 04:37:32.000000000 +0000
4+++ uuid-1.6.2/Makefile.in 2008-10-29 04:40:18.000000000 +0000
5@@ -55,7 +55,6 @@
6 CP = cp
7 RMDIR = rmdir
8 SHTOOL = $(S)/shtool
9-LIBTOOL = $(C)/libtool
10 TRUE = true
11 POD2MAN = pod2man
12 PERL = @PERL@
13Index: uuid-1.6.2/configure.ac
14===================================================================
15--- uuid-1.6.2.orig/configure.ac 2008-10-29 04:31:31.000000000 +0000
16+++ uuid-1.6.2/configure.ac 2008-10-29 04:33:07.000000000 +0000
17@@ -40,11 +40,8 @@
18
19 AC_PROG_MAKE_SET
20 AC_PROG_CC
21-AC_CHECK_DEBUGGING
22-AC_CHECK_DMALLOC
23
24 with_tags=""
25-sinclude(libtool.m4)
26 AC_PROG_LIBTOOL
27
28 sinclude(uuid.ac)
29Index: uuid-1.6.2/uuid.ac
30===================================================================
31--- uuid-1.6.2.orig/uuid.ac 2008-10-29 04:31:39.000000000 +0000
32+++ uuid-1.6.2/uuid.ac 2008-10-29 04:31:53.000000000 +0000
33@@ -39,9 +39,6 @@
34 fi
35 AC_CHECK_LIB(socket, accept)
36
37- dnl # check for portable va_copy()
38- AC_CHECK_VA_COPY()
39-
40 dnl # check for system headers
41 AC_CHECK_HEADERS(sys/types.h sys/param.h sys/time.h sys/socket.h sys/sockio.h sys/ioctl.h sys/select.h)
42 AC_CHECK_HEADERS(netdb.h ifaddrs.h net/if.h net/if_dl.h net/if_arp.h netinet/in.h arpa/inet.h,,,
diff --git a/meta/packages/uuid/uuid_1.6.2.bb b/meta/packages/uuid/uuid_1.6.2.bb
deleted file mode 100644
index eb76349d8f..0000000000
--- a/meta/packages/uuid/uuid_1.6.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1SRC_URI = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz \
2 file://fixes.patch;patch=1"
3PR = "r0"
4
5inherit autotools
6
7do_configure_prepend () {
8 rm libtool.m4
9}
10
11export LIBTOOL = "${S}/${TARGET_PREFIX}libtool"
12
13do_stage () {
14 autotools_stage_all
15} \ No newline at end of file
diff --git a/scripts/poky-autobuild-moblin b/scripts/poky-autobuild-moblin
index 0fa2ba0f0a..afd85964be 100755
--- a/scripts/poky-autobuild-moblin
+++ b/scripts/poky-autobuild-moblin
@@ -49,7 +49,7 @@ fi
49 49
50BDIR="build" 50BDIR="build"
51. ./scripts/poky-env-internal 51. ./scripts/poky-env-internal
52BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE GIT_CORE_CONFIG GIT_PROXY_IGNORE_1 GIT_PROXY_HOST GIT_PROXY_PORT" 52BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE"
53POSTPROCESS=`which poky-autobuild-postprocess-moblin` 53POSTPROCESS=`which poky-autobuild-postprocess-moblin`
54 54
55if [ "xcomplete" = "x$1" ]; then 55if [ "xcomplete" = "x$1" ]; then
@@ -68,12 +68,12 @@ if [ ! -e "$CONFFILE" ]; then
68 if [ ! -d "./conf" ]; then 68 if [ ! -d "./conf" ]; then
69 mkdir -p "./conf" 69 mkdir -p "./conf"
70 fi 70 fi
71 echo 'PACKAGE_CLASSES = "package_ipk package_deb"' > "$CONFFILE" 71 echo 'PACKAGE_CLASSES = "package_ipk package_deb package_rpm"' > "$CONFFILE"
72 echo 'BB_NUMBER_THREADS = "6"' >> "$CONFFILE" 72 echo 'BB_NUMBER_THREADS = "6"' >> "$CONFFILE"
73 echo 'PARALLEL_MAKE = "-j 6"' >> "$CONFFILE" 73 echo 'PARALLEL_MAKE = "-j 6"' >> "$CONFFILE"
74 echo "DL_DIR = \"$SRVWORKDIR/sources\"" >> "$CONFFILE" 74 echo "DL_DIR = \"$SRVWORKDIR/sources\"" >> "$CONFFILE"
75 echo 'INHERIT += "poky-autobuild-notifier"' >> "$CONFFILE" 75 echo 'INHERIT += "poky-autobuild-notifier"' >> "$CONFFILE"
76 echo 'GIT_PROXY_COMMAND=poky-git-proxy-socks-command' >> "$CONFFILE" 76 echo 'INHERIT += "poky-moblin-autobuilder-proxy-config"' >> "$CONFFILE"
77 if [ "$ABTARGET" = "darwin" ]; then 77 if [ "$ABTARGET" = "darwin" ]; then
78 echo 'PACKAGE_CLASSES += "package_tar"' >> "$CONFFILE" 78 echo 'PACKAGE_CLASSES += "package_tar"' >> "$CONFFILE"
79 echo "BBFILES += \"$CURRDIR/meta-darwin/packages/*/*.bb\"" >> "./conf/local.conf" 79 echo "BBFILES += \"$CURRDIR/meta-darwin/packages/*/*.bb\"" >> "./conf/local.conf"
@@ -84,6 +84,8 @@ if [ ! -e "$CONFFILE" ]; then
84 fi 84 fi
85fi 85fi
86 86
87BBPATH=$SRVWORKDIR/localmeta:$BBPATH
88
87if [ "$ABTARGET" = "darwin" ]; then 89if [ "$ABTARGET" = "darwin" ]; then
88 BBPATH=$CURRDIR/meta-darwin:$BBPATH 90 BBPATH=$CURRDIR/meta-darwin:$BBPATH
89fi 91fi
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 10:36:57 +0000