summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-09-19 09:04:09 +0000
committerChris Larson <kergoth@openedhand.com>2006-09-19 09:04:09 +0000
commit4fa2d11bb1fdb58ff426114169583672fc3d65b8 (patch)
tree0bd4952bbe057c3dc219be7e371a6a9d496c6535 /meta/packages
parent04f695333350e31fa87b7822c17a073af73fcd84 (diff)
downloadpoky-4fa2d11bb1fdb58ff426114169583672fc3d65b8.tar.gz
Sync up.. all the deb/dpkg changes which I have locally are now in svn.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/apt/apt-0.6.45exp2/noconfigure.patch35
-rw-r--r--meta/packages/apt/apt-native.inc56
-rw-r--r--meta/packages/apt/apt-native_0.6.45exp2.bb3
-rw-r--r--meta/packages/apt/files/apt.conf16
-rw-r--r--meta/packages/dpkg/dpkg-native_1.13.22.bb3
-rw-r--r--meta/packages/dpkg/dpkg.inc28
-rw-r--r--meta/packages/dpkg/dpkg_1.13.22.bb5
-rw-r--r--meta/packages/dpkg/files/nochroot.patch18
-rw-r--r--meta/packages/dpkg/files/noupdalt.patch16
-rw-r--r--meta/packages/glibc/glibc-package.bbclass4
-rw-r--r--meta/packages/images/oh-image-base.bb4
-rw-r--r--meta/packages/images/oh-image-core.bb4
-rw-r--r--meta/packages/images/oh-image-pda.bb4
-rw-r--r--meta/packages/images/oh-image-sdk.bb4
-rw-r--r--meta/packages/ipkg/files/noupdalt.patch15
-rw-r--r--meta/packages/ipkg/ipkg-native.inc2
-rw-r--r--meta/packages/ipkg/ipkg.inc4
-rw-r--r--meta/packages/ipkg/ipkg_0.99.154.bb2
-rw-r--r--meta/packages/ncurses/ncurses.inc4
-rw-r--r--meta/packages/sysfsutils/sysfsutils_2.0.0.bb4
-rw-r--r--meta/packages/tasks/task-oh.bb4
-rw-r--r--meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb11
-rw-r--r--meta/packages/update-alternatives/update-alternatives-cworth.inc6
-rw-r--r--meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb11
-rw-r--r--meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb14
-rw-r--r--meta/packages/update-alternatives/update-alternatives-dpkg.inc20
-rw-r--r--meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb12
-rwxr-xr-xmeta/packages/web/web_svn.bb1
-rw-r--r--meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb2
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch36
-rw-r--r--meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb3
31 files changed, 282 insertions, 69 deletions
diff --git a/meta/packages/apt/apt-0.6.45exp2/noconfigure.patch b/meta/packages/apt/apt-0.6.45exp2/noconfigure.patch
new file mode 100644
index 0000000000..682a96da24
--- /dev/null
+++ b/meta/packages/apt/apt-0.6.45exp2/noconfigure.patch
@@ -0,0 +1,35 @@
1---
2 apt-pkg/packagemanager.cc | 4 ++++
3 1 file changed, 4 insertions(+)
4
5--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc
6+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc
7@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI
8
9 List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
10
11+#if 0
12 // Perform immedate configuration of the package.
13 if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
14 if (SmartConfigure(Pkg) == false)
15 return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
16+#endif
17
18 return true;
19 }
20@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag
21 DoneSomething = true;
22 }
23
24+#if 0
25 // Final run through the configure phase
26 if (ConfigureAll() == false)
27 return Failed;
28@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag
29 return Failed;
30 }
31 }
32+#endif
33
34 return Completed;
35 }
diff --git a/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc
index 4ace9e94bb..de9426bf70 100644
--- a/meta/packages/apt/apt-native.inc
+++ b/meta/packages/apt/apt-native.inc
@@ -19,39 +19,43 @@ python do_stage_config () {
19 19
20 data = bb.data.expand(data, d) 20 data = bb.data.expand(data, d)
21 21
22 outpath = bb.data.expand('${STAGING_DIR}/${sysconfdir}/apt.conf', d) 22 outdir = os.path.join(bb.data.getVar('sysconfdir', d, 1), 'apt')
23 if not os.path.exists(outdir):
24 os.makedirs(outdir)
25 outpath = os.path.join(outdir, 'apt.conf')
26
23 outfile = file(outpath, 'w') 27 outfile = file(outpath, 'w')
24 outfile.write(data) 28 outfile.write(data)
25 outfile.close() 29 outfile.close()
26} 30}
27 31
28do_stage_base () { 32do_stage_base () {
29 install -d ${STAGING_BINDIR} 33 install -d ${bindir}
30 install -m 0755 bin/apt-cdrom ${STAGING_BINDIR}/ 34 install -m 0755 bin/apt-cdrom ${bindir}/
31 install -m 0755 bin/apt-get ${STAGING_BINDIR}/ 35 install -m 0755 bin/apt-get ${bindir}/
32 install -m 0755 bin/apt-config ${STAGING_BINDIR}/ 36 install -m 0755 bin/apt-config ${bindir}/
33 install -m 0755 bin/apt-cache ${STAGING_BINDIR}/ 37 install -m 0755 bin/apt-cache ${bindir}/
34 38
35 install -m 0755 bin/apt-sortpkgs ${STAGING_BINDIR}/ 39 install -m 0755 bin/apt-sortpkgs ${bindir}/
36 install -m 0755 bin/apt-extracttemplates ${STAGING_BINDIR}/ 40 install -m 0755 bin/apt-extracttemplates ${bindir}/
37 41
38 eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` 42 eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
39 oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ 43 oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${libdir}/
40 ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so 44 ln -sf libapt-pkg$GLIBC_VER-6.so ${libdir}/libapt-pkg.so
41 oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ 45 oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${libdir}/
42 ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so 46 ln -sf libapt-inst$GLIBC_VER-6.so ${libdir}/libapt-inst.so
43 47
44 install -d ${STAGING_LIBDIR}/apt/methods 48 install -d ${libdir}/apt/methods
45 install -m 0755 bin/methods/* ${STAGING_LIBDIR}/apt/methods/ 49 install -m 0755 bin/methods/* ${libdir}/apt/methods/
46 50
47 install -d ${STAGING_LIBDIR}/dpkg/methods/apt 51 install -d ${libdir}/dpkg/methods/apt
48 install -m 0644 dselect/desc.apt ${STAGING_LIBDIR}/dpkg/methods/apt/ 52 install -m 0644 dselect/desc.apt ${libdir}/dpkg/methods/apt/
49 install -m 0644 dselect/names ${STAGING_LIBDIR}/dpkg/methods/apt/ 53 install -m 0644 dselect/names ${libdir}/dpkg/methods/apt/
50 install -m 0755 dselect/install ${STAGING_LIBDIR}/dpkg/methods/apt/ 54 install -m 0755 dselect/install ${libdir}/dpkg/methods/apt/
51 install -m 0755 dselect/setup ${STAGING_LIBDIR}/dpkg/methods/apt/ 55 install -m 0755 dselect/setup ${libdir}/dpkg/methods/apt/
52 install -m 0755 dselect/update ${STAGING_LIBDIR}/dpkg/methods/apt/ 56 install -m 0755 dselect/update ${libdir}/dpkg/methods/apt/
53 57
54 install -d ${STAGING_DIR}${sysconfdir}/apt 58 install -d ${sysconfdir}/apt
55 install -d ${STAGING_DIR}${localstatedir}/lib/apt/lists/partial 59 install -d ${localstatedir}/lib/apt/lists/partial
56 install -d ${STAGING_DIR}${localstatedir}/cache/apt/archives/partial 60 install -d ${localstatedir}/cache/apt/archives/partial
57} 61}
diff --git a/meta/packages/apt/apt-native_0.6.45exp2.bb b/meta/packages/apt/apt-native_0.6.45exp2.bb
index 32f19e8e4c..43f73889f7 100644
--- a/meta/packages/apt/apt-native_0.6.45exp2.bb
+++ b/meta/packages/apt/apt-native_0.6.45exp2.bb
@@ -1,3 +1,4 @@
1require apt-native.inc 1require apt-native.inc
2 2
3SRC_URI += "file://nodoc.patch;patch=1" 3SRC_URI += "file://nodoc.patch;patch=1 \
4 file://noconfigure.patch;patch=1"
diff --git a/meta/packages/apt/files/apt.conf b/meta/packages/apt/files/apt.conf
index 944233c347..37785871db 100644
--- a/meta/packages/apt/files/apt.conf
+++ b/meta/packages/apt/files/apt.conf
@@ -3,7 +3,7 @@ Dir "${STAGING_DIR}/"
3 State "var/lib/apt/" 3 State "var/lib/apt/"
4 { 4 {
5 Lists "lists/"; 5 Lists "lists/";
6 status "${IMAGE_ROOTFS}/${localstatedir}/lib/dpkg/status"; 6 status "${IMAGE_ROOTFS}/var/dpkg/status";
7 }; 7 };
8 Cache "var/cache/apt/" 8 Cache "var/cache/apt/"
9 { 9 {
@@ -22,3 +22,17 @@ Dir "${STAGING_DIR}/"
22 apt-cache "apt-cache"; 22 apt-cache "apt-cache";
23 }; 23 };
24}; 24};
25
26APT
27{
28 Immediate-Configure "false";
29 Architecture "i586";
30 Get
31 {
32 Assume-Yes "true";
33 Force-Yes "true"
34 };
35};
36
37DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"};
38};
diff --git a/meta/packages/dpkg/dpkg-native_1.13.22.bb b/meta/packages/dpkg/dpkg-native_1.13.22.bb
index 2f196c2ea6..db71ab08e8 100644
--- a/meta/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/meta/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,8 +1,9 @@
1require dpkg.inc 1require dpkg.inc
2PR = "r1"
3DEPENDS += "ncurses-native zlib-native virtual/update-alternatives"
2SRC_URI += "file://noman.patch;patch=1" 4SRC_URI += "file://noman.patch;patch=1"
3 5
4inherit native 6inherit native
5inherit autotools gettext
6 7
7EXTRA_OECONF = "--without-static-progs \ 8EXTRA_OECONF = "--without-static-progs \
8 --without-dselect \ 9 --without-dselect \
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index 3c3f29c304..0d2053ab0f 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -1,10 +1,34 @@
1DESCRIPTION = "Package maintenance system for Debian." 1DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "base" 3SECTION = "base"
4DEPENDS = "ncurses zlib"
5MAINTAINER = "Chris Larson <kergoth@handhelds.org>" 4MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
6 5
7SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz" 6SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
7 file://noupdalt.patch;patch=1"
8S = "${WORKDIR}/dpkg-${PV}" 8S = "${WORKDIR}/dpkg-${PV}"
9 9
10DEPENDS_${PN} += "update-alternatives"
11
10PARALLEL_MAKE = "" 12PARALLEL_MAKE = ""
13
14inherit autotools gettext
15
16DPKG_INIT_POSITION = "98"
17DPKG_INIT_POSITION_slugos = "41"
18
19pkg_postinst_dpkg () {
20#!/bin/sh
21if [ "x$D" != "x" ]; then
22 install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
23 # this happens at S98 where our good 'ole packages script used to run
24 echo -e "#!/bin/sh
25 dpkg --configure -a
26" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
27 chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
28fi
29}
30
31do_configure () {
32 echo >> m4/compiler.m4
33 autotools_do_configure
34}
diff --git a/meta/packages/dpkg/dpkg_1.13.22.bb b/meta/packages/dpkg/dpkg_1.13.22.bb
index 08a9c06fbf..bcf45392b4 100644
--- a/meta/packages/dpkg/dpkg_1.13.22.bb
+++ b/meta/packages/dpkg/dpkg_1.13.22.bb
@@ -1,7 +1,6 @@
1require dpkg.inc 1require dpkg.inc
2DEPENDS += "bzip2" 2PR = "r2"
3 3DEPENDS += "ncurses zlib bzip2"
4inherit autotools gettext
5 4
6EXTRA_OECONF = "--without-static-progs \ 5EXTRA_OECONF = "--without-static-progs \
7 --without-dselect \ 6 --without-dselect \
diff --git a/meta/packages/dpkg/files/nochroot.patch b/meta/packages/dpkg/files/nochroot.patch
new file mode 100644
index 0000000000..3a8beaebbf
--- /dev/null
+++ b/meta/packages/dpkg/files/nochroot.patch
@@ -0,0 +1,18 @@
1---
2 src/help.c | 2 ++
3 1 file changed, 2 insertions(+)
4
5--- dpkg-1.13.22.orig/src/help.c
6+++ dpkg-1.13.22/src/help.c
7@@ -175,9 +175,11 @@ static const char* preexecscript(const c
8 */
9 size_t instdirl;
10
11+#if 0
12 if (*instdir) {
13 if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir);
14 }
15+#endif
16 if (f_debug & dbg_scripts) {
17 fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path);
18 while (*++argv) fprintf(stderr," %s",*argv);
diff --git a/meta/packages/dpkg/files/noupdalt.patch b/meta/packages/dpkg/files/noupdalt.patch
new file mode 100644
index 0000000000..023e99ae8d
--- /dev/null
+++ b/meta/packages/dpkg/files/noupdalt.patch
@@ -0,0 +1,16 @@
1---
2 scripts/Makefile.am | 3 +--
3 1 file changed, 1 insertion(+), 2 deletions(-)
4
5--- dpkg-1.13.22.orig/scripts/Makefile.am
6+++ dpkg-1.13.22/scripts/Makefile.am
7@@ -20,8 +20,7 @@ bin_SCRIPTS = \
8 sbin_SCRIPTS = \
9 cleanup-info \
10 dpkg-divert \
11- dpkg-statoverride \
12- update-alternatives
13+ dpkg-statoverride
14
15 changelogdir = $(pkglibdir)/parsechangelog
16 changelog_SCRIPTS = \
diff --git a/meta/packages/glibc/glibc-package.bbclass b/meta/packages/glibc/glibc-package.bbclass
index 3ce10b54de..6b191434ed 100644
--- a/meta/packages/glibc/glibc-package.bbclass
+++ b/meta/packages/glibc/glibc-package.bbclass
@@ -194,6 +194,10 @@ python package_do_split_gconvs () {
194 if m: 194 if m:
195 dp = legitimize_package_name('glibc-localedata-%s' % m.group(1)) 195 dp = legitimize_package_name('glibc-localedata-%s' % m.group(1))
196 if not dp in deps: 196 if not dp in deps:
197 if '<' in dp:
198 bb.note('warning, dp is %s' % dp)
199 bb.note(' fn is %s' % fn)
200 bb.note(' line was %s' % l)
197 deps.append(dp) 201 deps.append(dp)
198 f.close() 202 f.close()
199 if deps != []: 203 if deps != []:
diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb
index 2bc152b998..4a61e70519 100644
--- a/meta/packages/images/oh-image-base.bb
+++ b/meta/packages/images/oh-image-base.bb
@@ -6,7 +6,7 @@ DEPENDS = "task-oh"
6 6
7RDEPENDS = "task-oh-boot task-oh-boot-extras" 7RDEPENDS = "task-oh-boot task-oh-boot-extras"
8 8
9export IPKG_INSTALL = "${RDEPENDS}" 9export PACKAGE_INSTALL = "${RDEPENDS}"
10 10
11inherit image_ipk 11inherit image
12LICENSE = MIT 12LICENSE = MIT
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index 73f7afbe16..e416d84843 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -9,7 +9,7 @@ RDEPENDS = "\
9 task-oh-boot-extras \ 9 task-oh-boot-extras \
10 task-oh-base " 10 task-oh-base "
11 11
12export IPKG_INSTALL = "${RDEPENDS}" 12export PACKAGE_INSTALL = "${RDEPENDS}"
13 13
14inherit image_ipk 14inherit image
15LICENSE = MIT 15LICENSE = MIT
diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb
index de2f3e0a4c..d4576a0c55 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -12,7 +12,7 @@ RDEPENDS = "\
12 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \ 12 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \
13 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} " 13 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} "
14 14
15export IPKG_INSTALL = "${RDEPENDS}" 15export PACKAGE_INSTALL = "${RDEPENDS}"
16 16
17inherit image_ipk 17inherit image
18LICENSE = MIT 18LICENSE = MIT
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index 71b1c300b5..08e37a7b89 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -15,7 +15,7 @@ RDEPENDS = "\
15 task-oh-testapps \ 15 task-oh-testapps \
16 task-oh-sdk " 16 task-oh-sdk "
17 17
18export IPKG_INSTALL = "${RDEPENDS}" 18export PACKAGE_INSTALL = "${RDEPENDS}"
19 19
20inherit image_ipk 20inherit image
21LICENSE = MIT 21LICENSE = MIT
diff --git a/meta/packages/ipkg/files/noupdalt.patch b/meta/packages/ipkg/files/noupdalt.patch
new file mode 100644
index 0000000000..f668e82f6b
--- /dev/null
+++ b/meta/packages/ipkg/files/noupdalt.patch
@@ -0,0 +1,15 @@
1---
2 Makefile.am | 2 --
3 1 file changed, 2 deletions(-)
4
5--- C.orig/Makefile.am
6+++ C/Makefile.am
7@@ -10,8 +10,6 @@ bin_PROGRAMS = ipkg-cl
8
9 lib_LTLIBRARIES = libipkg.la
10
11-bin_SCRIPTS = update-alternatives
12-
13 # ipkg_LDADD = libbb/libbb.a replace/libreplace.a
14
15 #ipkg_cl_LDADD = libipkg.la libbb/libbb.la replace/libreplace.a
diff --git a/meta/packages/ipkg/ipkg-native.inc b/meta/packages/ipkg/ipkg-native.inc
index b52b7b5e20..070086a638 100644
--- a/meta/packages/ipkg/ipkg-native.inc
+++ b/meta/packages/ipkg/ipkg-native.inc
@@ -7,6 +7,6 @@ inherit native
7 7
8EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg" 8EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg"
9 9
10DEPENDS = "libtool-native automake-native" 10DEPENDS = "libtool-native automake-native virtual/update-alternatives"
11FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}" 11FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
12PROVIDES = "" 12PROVIDES = ""
diff --git a/meta/packages/ipkg/ipkg.inc b/meta/packages/ipkg/ipkg.inc
index 49bdd22c08..e72ece633b 100644
--- a/meta/packages/ipkg/ipkg.inc
+++ b/meta/packages/ipkg/ipkg.inc
@@ -5,13 +5,15 @@ LICENSE = "GPL"
5PROVIDES = "virtual/ipkg libipkg" 5PROVIDES = "virtual/ipkg libipkg"
6 6
7PACKAGES =+ "libipkg-dev libipkg" 7PACKAGES =+ "libipkg-dev libipkg"
8RDEPENDS_${PN} += "update-alternatives"
8FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" 9FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
9FILES_libipkg = "${libdir}" 10FILES_libipkg = "${libdir}"
10AUTO_LIBNAME_PKGS = "libipkg" 11AUTO_LIBNAME_PKGS = "libipkg"
11 12
12SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \ 13SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
13 file://fix_tar_extension.patch;patch=1 \ 14 file://fix_tar_extension.patch;patch=1 \
14 file://terse.patch;patch=1" 15 file://terse.patch;patch=1 \
16 file://noupdalt.patch;patch=1"
15 17
16S = "${WORKDIR}/ipkg/C" 18S = "${WORKDIR}/ipkg/C"
17 19
diff --git a/meta/packages/ipkg/ipkg_0.99.154.bb b/meta/packages/ipkg/ipkg_0.99.154.bb
index 20a1996658..eb36fa67cb 100644
--- a/meta/packages/ipkg/ipkg_0.99.154.bb
+++ b/meta/packages/ipkg/ipkg_0.99.154.bb
@@ -1,2 +1,2 @@
1require ipkg.inc 1require ipkg.inc
2PR = "r4" 2PR = "r5"
diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc
index 030cd1034c..bc0bb4603c 100644
--- a/meta/packages/ncurses/ncurses.inc
+++ b/meta/packages/ncurses/ncurses.inc
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"
3LICENSE = "MIT" 3LICENSE = "MIT"
4SECTION = "libs" 4SECTION = "libs"
5DEPENDS = "ncurses-native" 5DEPENDS = "ncurses-native"
6PACKAGES_prepend = "ncurses-tools " 6PACKAGES =+ "ncurses-tools "
7PACKAGES_append = " ncurses-terminfo" 7PACKAGES += " ncurses-terminfo"
8FILES_ncurses_append = " ${datadir}/tabset" 8FILES_ncurses_append = " ${datadir}/tabset"
9RSUGGESTS_${PN} = "ncurses-terminfo" 9RSUGGESTS_${PN} = "ncurses-terminfo"
10RPROVIDES = "libncurses5" 10RPROVIDES = "libncurses5"
diff --git a/meta/packages/sysfsutils/sysfsutils_2.0.0.bb b/meta/packages/sysfsutils/sysfsutils_2.0.0.bb
index 176c8870e4..252990cba5 100644
--- a/meta/packages/sysfsutils/sysfsutils_2.0.0.bb
+++ b/meta/packages/sysfsutils/sysfsutils_2.0.0.bb
@@ -12,8 +12,8 @@ inherit autotools
12 12
13includedir += "/sysfs" 13includedir += "/sysfs"
14 14
15PACKAGES_prepend = "libsysfs " 15# PACKAGES_prepend = "libsysfs "
16FILES_libsysfs = "${libdir}/*.so.2.0.0" 16# FILES_libsysfs = "${libdir}/*.so.2.0.0"
17 17
18do_stage () { 18do_stage () {
19 oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR} 19 oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
diff --git a/meta/packages/tasks/task-oh.bb b/meta/packages/tasks/task-oh.bb
index 6b8125966b..e0ffb73cfb 100644
--- a/meta/packages/tasks/task-oh.bb
+++ b/meta/packages/tasks/task-oh.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Tasks for OpenedHand Poky" 1DESCRIPTION = "Tasks for OpenedHand Poky"
2MAINTAINER = "Richard Purdie <richard@openedhand.com>" 2MAINTAINER = "Richard Purdie <richard@openedhand.com>"
3PR = "r41" 3PR = "r42"
4 4
5PACKAGES = "\ 5PACKAGES = "\
6 task-oh-base \ 6 task-oh-base \
@@ -27,7 +27,7 @@ RDEPENDS_task-oh-boot = "\
27 modutils-initscripts \ 27 modutils-initscripts \
28 fuser \ 28 fuser \
29 setserial \ 29 setserial \
30 ipkg \ 30 update-alternatives \
31 module-init-tools-depmod" 31 module-init-tools-depmod"
32# linux-hotplug \ 32# linux-hotplug \
33 33
diff --git a/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb b/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb
new file mode 100644
index 0000000000..99f8c07244
--- /dev/null
+++ b/meta/packages/update-alternatives/update-alternatives-cworth-native_0.99.154.bb
@@ -0,0 +1,11 @@
1require update-alternatives-cworth.inc
2inherit native
3
4PROVIDES += "virtual/update-alternatives"
5
6do_stage () {
7 install -d ${sbindir} \
8 ${libdir}/ipkg/alternatives
9
10 install -m 0755 update-alternatives ${sbindir}/update-alternatives
11}
diff --git a/meta/packages/update-alternatives/update-alternatives-cworth.inc b/meta/packages/update-alternatives/update-alternatives-cworth.inc
new file mode 100644
index 0000000000..e5bf1c8e27
--- /dev/null
+++ b/meta/packages/update-alternatives/update-alternatives-cworth.inc
@@ -0,0 +1,6 @@
1LICENSE = "GPL"
2SECTION = "base"
3MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
4SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')}"
5S = "${WORKDIR}/ipkg/C"
6PACKAGE_ARCH = "all"
diff --git a/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb b/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb
new file mode 100644
index 0000000000..18dab4e65f
--- /dev/null
+++ b/meta/packages/update-alternatives/update-alternatives-cworth_0.99.154.bb
@@ -0,0 +1,11 @@
1require update-alternatives-cworth.inc
2
3RPROVIDES_${PN} = "update-alternatives"
4
5do_install () {
6 install -d ${D}${sbindir} \
7 ${D}${sysconfdir}/alternatives \
8 ${D}${libdir}/ipkg/alternatives
9
10 install -m 0755 update-alternatives ${D}${sbindir}/update-alternatives
11}
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb b/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb
new file mode 100644
index 0000000000..f621e6a13f
--- /dev/null
+++ b/meta/packages/update-alternatives/update-alternatives-dpkg-native_1.13.22.bb
@@ -0,0 +1,14 @@
1require update-alternatives-dpkg.inc
2inherit native
3
4PROVIDES += "virtual/update-alternatives"
5DEPENDS += "perl-native dpkg-native"
6DEFAULT_PREFERENCE = "-1"
7
8do_stage () {
9 install -d ${sbindir} \
10 ${localstatedir}/dpkg/alternatives \
11 ${sysconfdir}/alternatives
12
13 install -m 0755 scripts/update-alternatives ${sbindir}/update-alternatives
14}
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg.inc b/meta/packages/update-alternatives/update-alternatives-dpkg.inc
new file mode 100644
index 0000000000..e767ed632b
--- /dev/null
+++ b/meta/packages/update-alternatives/update-alternatives-dpkg.inc
@@ -0,0 +1,20 @@
1LICENSE = "GPL"
2SECTION = "base"
3MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
4SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
5S = "${WORKDIR}/dpkg-${PV}"
6PACKAGE_ARCH = "all"
7
8do_patch () {
9 cat ${S}/scripts/update-alternatives.pl | \
10 sed -n -e '
11 /^\$admindir=.*staging/{
12 x
13 s/^.*$/$D=$ENV{"D"} || ""\;/;
14 p;
15 x;
16 s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/dpkg"\;,;
17 };
18 s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,;
19 p;' > ${S}/scripts/update-alternatives
20}
diff --git a/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb b/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb
new file mode 100644
index 0000000000..a07d5e36d4
--- /dev/null
+++ b/meta/packages/update-alternatives/update-alternatives-dpkg_1.13.22.bb
@@ -0,0 +1,12 @@
1require update-alternatives-dpkg.inc
2
3RPROVIDES_${PN} = "update-alternatives"
4RDEPENDS_${PN} = "perl dpkg"
5
6do_install () {
7 install -d ${D}${sbindir} \
8 ${D}${localstatedir}/dpkg/alternatives \
9 ${D}${sysconfdir}/alternatives
10
11 install -m 0755 scripts/update-alternatives ${D}${sbindir}/update-alternatives
12}
diff --git a/meta/packages/web/web_svn.bb b/meta/packages/web/web_svn.bb
index f79df30c42..018cbc9bec 100755
--- a/meta/packages/web/web_svn.bb
+++ b/meta/packages/web/web_svn.bb
@@ -4,6 +4,7 @@ DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js"
4MAINTAINER = "Chris Lord <chris@openedhand.com>" 4MAINTAINER = "Chris Lord <chris@openedhand.com>"
5DESCRIPTION = "Web is a multi-platform web browsing application." 5DESCRIPTION = "Web is a multi-platform web browsing application."
6 6
7PV = "0.0+svn${SRCDATE}"
7PR = "r1" 8PR = "r1"
8SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" 9SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http"
9S = "${WORKDIR}/trunk" 10S = "${WORKDIR}/trunk"
diff --git a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index b31ed72998..bbd4993345 100644
--- a/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Base X libs."
5DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 5DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
6 libxdmcp xf86bigfontproto kbproto inputproto" 6 libxdmcp xf86bigfontproto kbproto inputproto"
7PROVIDES = "virtual/libx11" 7PROVIDES = "virtual/libx11"
8RPROVIDES = "virtual/libx11" 8# RPROVIDES = "virtual/libx11"
9 9
10XORG_PN = "libX11" 10XORG_PN = "libX11"
11 11
diff --git a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch
index 89a56719d7..a8f002ea2a 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch
+++ b/meta/packages/xorg-xserver/xserver-kdrive/xfbdev-fb-opt.patch
@@ -1,8 +1,18 @@
1diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c 1---
2index 86384f0..904d5f3 100644 2 hw/kdrive/fbdev/fbdev.c | 17 ++++++++++++-----
3--- a/hw/kdrive/fbdev/fbdev.c 3 hw/kdrive/fbdev/fbdev.h | 1 +
4+++ b/hw/kdrive/fbdev/fbdev.c 4 hw/kdrive/fbdev/fbinit.c | 20 ++++++++++++++++----
5@@ -38,11 +38,17 @@ fbdevInitialize (KdCardInfo *card, Fbdev 5 3 files changed, 29 insertions(+), 9 deletions(-)
6
7--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.c
8+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.c
9@@ -33,16 +33,23 @@
10
11 extern int KdTsPhyScreen;
12
13+char *fbdevDevicePath = NULL;
14 Bool
15 fbdevInitialize (KdCardInfo *card, FbdevPriv *priv)
6 { 16 {
7 int k; 17 int k;
8 unsigned long off; 18 unsigned long off;
@@ -25,10 +35,8 @@ index 86384f0..904d5f3 100644
25 /* quiet valgrind */ 35 /* quiet valgrind */
26 memset (&priv->fix, '\0', sizeof (priv->fix)); 36 memset (&priv->fix, '\0', sizeof (priv->fix));
27 if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) { 37 if ((k=ioctl(priv->fd, FBIOGET_FSCREENINFO, &priv->fix)) < 0) {
28diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h 38--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbdev.h
29index d37b995..b7951db 100644 39+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbdev.h
30--- a/hw/kdrive/fbdev/fbdev.h
31+++ b/hw/kdrive/fbdev/fbdev.h
32@@ -53,6 +53,7 @@ typedef struct _fbdevScrPriv { 40@@ -53,6 +53,7 @@ typedef struct _fbdevScrPriv {
33 } FbdevScrPriv; 41 } FbdevScrPriv;
34 42
@@ -37,11 +45,9 @@ index d37b995..b7951db 100644
37 45
38 Bool 46 Bool
39 fbdevInitialize (KdCardInfo *card, FbdevPriv *priv); 47 fbdevInitialize (KdCardInfo *card, FbdevPriv *priv);
40diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c 48--- xorg-server-X11R7.1-1.1.0.orig/hw/kdrive/fbdev/fbinit.c
41index ba9d1c6..1a7e4bf 100644 49+++ xorg-server-X11R7.1-1.1.0/hw/kdrive/fbdev/fbinit.c
42--- a/hw/kdrive/fbdev/fbinit.c 50@@ -59,16 +59,28 @@ InitInput (int argc, char **argv)
43+++ b/hw/kdrive/fbdev/fbinit.c
44@@ -54,17 +54,30 @@ InitInput (int argc, char **argv)
45 void 51 void
46 ddxUseMsg (void) 52 ddxUseMsg (void)
47 { 53 {
@@ -72,7 +78,5 @@ index ba9d1c6..1a7e4bf 100644
72+ return KdProcessArgument (argc, argv, i); 78+ return KdProcessArgument (argc, argv, i);
73+} 79+}
74 80
75+char *fbdevDevicePath = NULL;
76 KdCardFuncs fbdevFuncs = { 81 KdCardFuncs fbdevFuncs = {
77 fbdevCardInit, /* cardinit */ 82 fbdevCardInit, /* cardinit */
78 fbdevScreenInit, /* scrinit */
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
index 92857dc62b..987b46021f 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
@@ -2,7 +2,7 @@ LICENSE = "MIT"
2DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto" 2DEPENDS = "tslib xproto libxdmcp xextproto xtrans libxau virtual/libx11 libxext libxrandr fixesproto damageproto libxfont resourceproto compositeproto xcalibrateext recordproto videoproto scrnsaverproto"
3 3
4PROVIDES = "virtual/xserver" 4PROVIDES = "virtual/xserver"
5RPROVIDES = "virtual/xserver" 5# RPROVIDES = "virtual/xserver"
6PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale" 6PACKAGES = "xserver-kdrive-fbdev xserver-kdrive-fake xserver-kdrive-xephyr ${PN}-doc ${PN}-dev ${PN}-locale"
7SECTION = "x11/base" 7SECTION = "x11/base"
8DESCRIPTION = "X server from freedesktop.org" 8DESCRIPTION = "X server from freedesktop.org"
@@ -32,6 +32,7 @@ SRC_URI = "http://ftp.x.org/pub/X11R7.1/src/xserver/xorg-server-X11R7.1-1.1.0.ta
32 32
33SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" 33SRC_URI_append_mnci = " file://onlyfb.patch;patch=1"
34SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" 34SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
35SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1"
35PACKAGE_ARCH_poodle = "poodle" 36PACKAGE_ARCH_poodle = "poodle"
36 37
37S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" 38S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-07 18:25:21 +0000