Send commitlog mailing list submissions to
commitlog@lists.openmoko.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4045 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
2. r4046 - branches/src/target/kernel/2.6.24.x/patches
([EMAIL PROTECTED])
3. r4047 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
4. r4048 - trunk/src/host/devirginator ([EMAIL PROTECTED])
5. r4049 - in trunk/src/target/opkg: . libopkg tests
([EMAIL PROTECTED])
6. r4050 - trunk/src/target/opkg ([EMAIL PROTECTED])
7. r4051 - in trunk/src/target/opkg: . libopkg src tests
([EMAIL PROTECTED])
--- Begin Message ---
Author: werner
Date: 2008-02-11 01:20:15 +0100 (Mon, 11 Feb 2008)
New Revision: 4045
Added:
branches/src/target/kernel/2.6.24.x/patches/fix-pcf50633-LOWBAT-kill-init.patch
Modified:
branches/src/target/kernel/2.6.24.x/patches/series
Log:
fix-pcf50633-LOWBAT-kill-init.patch
(Corrected a & vs. == precedence inversion.)
From: Andy Green <[EMAIL PROTECTED]>
Until now the driver treats LOWBAT as a fatal crisis and responds
by going postal on init. But the driver didn't think that we can
have adapter or USB power and no battery, which is fine.
This patch reserves the crisis behaviour for when we have no
adapter / USB power and just acknowledges the PMU exception when
we do.
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
---
drivers/i2c/chips/pcf50633.c | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
Added:
branches/src/target/kernel/2.6.24.x/patches/fix-pcf50633-LOWBAT-kill-init.patch
===================================================================
---
branches/src/target/kernel/2.6.24.x/patches/fix-pcf50633-LOWBAT-kill-init.patch
2008-02-10 23:37:02 UTC (rev 4044)
+++
branches/src/target/kernel/2.6.24.x/patches/fix-pcf50633-LOWBAT-kill-init.patch
2008-02-11 00:20:15 UTC (rev 4045)
@@ -0,0 +1,37 @@
+Index: linux-2.6.24/drivers/i2c/chips/pcf50633.c
+===================================================================
+--- linux-2.6.24.orig/drivers/i2c/chips/pcf50633.c
++++ linux-2.6.24/drivers/i2c/chips/pcf50633.c
+@@ -637,15 +637,25 @@
+ }
+
+ if (int4 & (PCF50633_INT4_LOWBAT|PCF50633_INT4_LOWSYS)) {
+- /* Really low battery voltage, we have 8 seconds left */
+- DEBUGPC("LOWBAT ");
+- apm_queue_event(APM_LOW_BATTERY);
+- DEBUGPC("SIGPWR(init) ");
+- kill_proc(1, SIGPWR, 1);
++ if ((__reg_read(pcf, PCF50633_REG_MBCS1) &
++ (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) ==
++ (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) {
++ /*
++ * hey no need to freak out, we have some kind of
++ * valid charger power
++ */
++ DEBUGPC("(NO)BAT ");
++ } else {
++ /* Really low battery voltage, we have 8 seconds left */
++ DEBUGPC("LOWBAT ");
++ apm_queue_event(APM_LOW_BATTERY);
++ DEBUGPC("SIGPWR(init) ");
++ kill_proc(1, SIGPWR, 1);
++ }
+ /* Tell PMU we are taking care of this */
+ reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
+- PCF50633_OOCSHDWN_TOTRST,
+- PCF50633_OOCSHDWN_TOTRST);
++ PCF50633_OOCSHDWN_TOTRST,
++ PCF50633_OOCSHDWN_TOTRST);
+ }
+ if (int4 & PCF50633_INT4_HIGHTMP) {
+ /* High temperature */
Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series 2008-02-10 23:37:02 UTC
(rev 4044)
+++ branches/src/target/kernel/2.6.24.x/patches/series 2008-02-11 00:20:15 UTC
(rev 4045)
@@ -76,9 +76,10 @@
introduce-fiq-basis.patch
introduce-fiq-use-timer3-as-source.patch
introduce-fiq-migrate-vibrator-gta02-only.patch
+fiq-hdq.patch
+#bq27000-battery-driver.patch
# OE patches
-fiq-hdq.patch
fix-EVIOCGRAB-semantics.patch
iis-suspend.patch
s3c24xx-pcm-suspend.patch
@@ -93,6 +94,9 @@
# bad bug
fix-hwecc-2410.patch
+# this may not be the last word on this issue, but the patch certainly helps
+fix-pcf50633-LOWBAT-kill-init.patch
+
# leapfrogged from upstream
kexec-atags.patch
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-11 04:06:39 +0100 (Mon, 11 Feb 2008)
New Revision: 4046
Added:
branches/src/target/kernel/2.6.24.x/patches/gta01-dehang-printk.patch
Modified:
branches/src/target/kernel/2.6.24.x/patches/series
Log:
This is a temporary work-around Mike Westerhof for this bug:
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=788
See also
http://lists.openmoko.org/pipermail/openmoko-kernel/2008-February/000804.html
gta01-dehang-printk.patch:
- drivers/serial/s3c2410.c (s3c24xx_serial_console_putchar): disable flow
control while trying to printk
Added: branches/src/target/kernel/2.6.24.x/patches/gta01-dehang-printk.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-dehang-printk.patch
2008-02-11 00:20:15 UTC (rev 4045)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-dehang-printk.patch
2008-02-11 03:06:39 UTC (rev 4046)
@@ -0,0 +1,34 @@
+This is a temporary work-around Mike Westerhof for this bug:
+http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=788
+
+See also
+http://lists.openmoko.org/pipermail/openmoko-kernel/2008-February/000804.html
+
+(It's the 2nd option.)
+
+We may settle on a different solution in the future, depending on
+feedback from upstream.
+
+Index: linux-2.6.24/drivers/serial/s3c2410.c
+===================================================================
+--- linux-2.6.24.orig/drivers/serial/s3c2410.c
++++ linux-2.6.24/drivers/serial/s3c2410.c
+@@ -1717,9 +1717,18 @@
+ s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
+ {
+ unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
++ unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
++
++ /* If auto HW flow control enabled, temporarily turn it off */
++ if (umcon & S3C2410_UMCOM_AFC)
++ wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
++
+ while (!s3c24xx_serial_console_txrdy(port, ufcon))
+ barrier();
+ wr_regb(cons_uart, S3C2410_UTXH, ch);
++
++ if (umcon & S3C2410_UMCOM_AFC)
++ wr_regl(port, S3C2410_UMCON, umcon);
+ }
+
+ static void
Modified: branches/src/target/kernel/2.6.24.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/series 2008-02-11 00:20:15 UTC
(rev 4045)
+++ branches/src/target/kernel/2.6.24.x/patches/series 2008-02-11 03:06:39 UTC
(rev 4046)
@@ -97,6 +97,9 @@
# this may not be the last word on this issue, but the patch certainly helps
fix-pcf50633-LOWBAT-kill-init.patch
+# temporary work-around. awaiting decision on correct fix from upstream.
+gta01-dehang-printk.patch
+
# leapfrogged from upstream
kexec-atags.patch
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-11 04:10:43 +0100 (Mon, 11 Feb 2008)
New Revision: 4047
Modified:
trunk/src/target/u-boot/patches/uboot-gta02.patch
Log:
Recent GTA02 have 256MB of NAND. Use them ! :-)
uboot-gta02.patch:
- board/neo1973/gta02/gta02.c (dynpart_size): sized don't need to add up to
exactly the nominal size
- board/neo1973/gta02/gta02.c (dynpart_size): changes size of rootfs from 128MB
to 256MB
Modified: trunk/src/target/u-boot/patches/uboot-gta02.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-02-11 03:06:39 UTC
(rev 4046)
+++ trunk/src/target/u-boot/patches/uboot-gta02.patch 2008-02-11 03:10:43 UTC
(rev 4047)
@@ -507,11 +507,11 @@
+ return 1;
+}
+
-+/* The sum of all part_size[]s must equal to the NAND size, i.e., 0x8000000.
*/
++/* The sum of all part_size[]s must equal to or greater than the NAND size,
++ i.e., 0x10000000. */
+
+unsigned int dynpart_size[] = {
-+ CFG_UBOOT_SIZE, CFG_ENV_SIZE, 0x800000, 0xa0000, 0x40000,
-+ 0x8000000-CFG_UBOOT_SIZE-CFG_ENV_SIZE-0x800000-0xa0000-0x40000, 0 };
++ CFG_UBOOT_SIZE, CFG_ENV_SIZE, 0x800000, 0xa0000, 0x40000, 0x10000000, 0 };
+char *dynpart_names[] = {
+ "u-boot", "u-boot_env", "kernel", "splash", "factory", "rootfs", NULL };
+
--- End Message ---
--- Begin Message ---
Author: werner
Date: 2008-02-11 06:29:48 +0100 (Mon, 11 Feb 2008)
New Revision: 4048
Modified:
trunk/src/host/devirginator/mknor
Log:
root device is mtdblock6, not mtdblock5.
Modified: trunk/src/host/devirginator/mknor
===================================================================
--- trunk/src/host/devirginator/mknor 2008-02-11 03:10:43 UTC (rev 4047)
+++ trunk/src/host/devirginator/mknor 2008-02-11 05:29:48 UTC (rev 4048)
@@ -69,7 +69,7 @@
bootargs_base=
rootfstype=jffs2
- root=/dev/mtdblock5
+ root=/dev/mtdblock6
console=ttySAC2,115200
console=tty0
loglevel=8
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-02-11 11:28:29 +0100 (Mon, 11 Feb 2008)
New Revision: 4049
Added:
trunk/src/target/opkg/tests/
trunk/src/target/opkg/tests/Makefile.am
trunk/src/target/opkg/tests/opkg_extract_test.c
trunk/src/target/opkg/tests/opkg_hash_test.c
Removed:
trunk/src/target/opkg/libopkg/opkg_extract_test.c
trunk/src/target/opkg/libopkg/opkg_hash_test.c
Modified:
trunk/src/target/opkg/Makefile.am
trunk/src/target/opkg/configure.ac
trunk/src/target/opkg/libopkg/Makefile.am
Log:
opkg: move tests into a separate directory
Modified: trunk/src/target/opkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/Makefile.am 2008-02-11 05:29:48 UTC (rev 4048)
+++ trunk/src/target/opkg/Makefile.am 2008-02-11 10:28:29 UTC (rev 4049)
@@ -1,5 +1,4 @@
-#SUBDIRS = etc replace familiar libbb
-SUBDIRS = etc familiar libbb libopkg src
+SUBDIRS = etc familiar libbb libopkg tests src
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
Modified: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/opkg/configure.ac 2008-02-11 05:29:48 UTC (rev 4048)
+++ trunk/src/target/opkg/configure.ac 2008-02-11 10:28:29 UTC (rev 4049)
@@ -129,6 +129,7 @@
AC_OUTPUT(
Makefile
libopkg/Makefile
+ tests/Makefile
src/Makefile
etc/Makefile
familiar/Makefile
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-02-11 05:29:48 UTC (rev
4048)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-02-11 10:28:29 UTC (rev
4049)
@@ -63,14 +63,3 @@
lib_LTLIBRARIES = libopkg.la
-noinst_PROGRAMS = opkg_hash_test opkg_extract_test
-
-opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la
-opkg_hash_test_SOURCES = opkg_hash_test.c $(opkg_db_sources)
$(opkg_util_sources) $(opkg_list_sources)
-opkg_hash_test_CFLAGS = $(ALL_CFLAGS)
-
-opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la
-opkg_extract_test_SOURCES = opkg_extract_test.c $(opkg_db_sources)
$(opkg_util_sources) $(opkg_list_sources)
-opkg_extract_test_CFLAGS = $(ALL_CFLAGS)
-
-
Deleted: trunk/src/target/opkg/libopkg/opkg_extract_test.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_extract_test.c 2008-02-11 05:29:48 UTC
(rev 4048)
+++ trunk/src/target/opkg/libopkg/opkg_extract_test.c 2008-02-11 10:28:29 UTC
(rev 4049)
@@ -1,46 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "libbb/libbb.h"
-
-/*
- * build thus:
-
- * gcc -o opkg_extract_test opkg_extract_test.c -I./busybox-0.60.2/libbb
-L./busybox-0.60.2 -lbb
- *
- */
-const char * applet_name;
-
-int main(int argc, char * argv[])
-{
- /*
- * see libbb.h and let your imagination run wild
- * or, set the last item below to extract_one_to_buffer, and you get the
control file in
- * "returned"
- * or, set the last one to extract_all_to_fs, and, well, guess what happens
- */
-
- /* enum extract_functions_e dowhat = extract_control_tar_gz |
extract_unconditional | extract_one_to_buffer; */
- enum extract_functions_e dowhat = extract_control_tar_gz |
extract_all_to_fs | extract_preserve_date;
- char * returned;
- char * filename;
-
- if(argc < 2){
- fprintf(stderr, "syntax: %s <opkg file> [<file_to_extract>]\n", argv[0]);
- exit(0);
- }
-
- if (argc < 3){
- filename=NULL;
- } else {
- filename = argv[2];
- }
-
- returned = deb_extract(argv[1], stdout, dowhat, NULL, filename);
-
- if(returned)
- fprintf(stderr, "returned %s\n", returned);
- else
- fprintf(stderr, "extract returned nuthin'\n");
-
- return 0;
-}
Deleted: trunk/src/target/opkg/libopkg/opkg_hash_test.c
===================================================================
--- trunk/src/target/opkg/libopkg/opkg_hash_test.c 2008-02-11 05:29:48 UTC
(rev 4048)
+++ trunk/src/target/opkg/libopkg/opkg_hash_test.c 2008-02-11 10:28:29 UTC
(rev 4049)
@@ -1,79 +0,0 @@
-/* opkg_hash_test.c - the itsy package management system
-
- Carl D. Worth
-
- Copyright (C) 2001 University of Southern California
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-*/
-
-#include "opkg.h"
-
-#include "hash_table.h"
-#include "opkg_utils.h"
-#include "pkg_hash.h"
-
-int main(int argc, char *argv[])
-{
- opkg_conf_t conf;
- hash_table_t *hash = &conf.pkg_hash;
- pkg_vec_t * pkg_vec;
-
- if (argc < 3) {
- fprintf(stderr, "Usage: %s <pkgs_file1> <pkgs_file2> [pkg_name...]\n",
argv[0]);
- exit(1);
- }
- pkg_hash_init("test", hash, 1024);
-
- pkg_hash_add_from_file(&conf, argv[1], NULL, NULL, 0);
- pkg_hash_add_from_file(&conf, argv[2], NULL, NULL, 0);
-
- if (argc < 4) {
- pkg_print_info( pkg_hash_fetch_by_name_version(hash, "libc6",
"2.2.3-2"), stdout);
- /* for(i = 0; i < pkg_vec->len; i++)
- pkg_print(pkg_vec->pkgs[i], stdout);
- */
- } else {
- int i, j, k;
- char **unresolved;
-
- pkg_vec_t * dep_vec;
- for (i = 3; i < argc; i++) {
- pkg_vec = pkg_vec_fetch_by_name(hash, argv[i]);
- if (pkg_vec == NULL) {
- fprintf(stderr, "*** WARNING: Unknown package: %s\n\n",
argv[i]);
- continue;
- }
-
- for(j = 0; j < pkg_vec->len; j++){
- pkg_print_info(pkg_vec->pkgs[j], stdout);
- dep_vec = pkg_vec_alloc();
- pkg_hash_fetch_unsatisfied_dependencies(&conf,
- pkg_vec->pkgs[j],
- dep_vec,
- &unresolved);
- if(dep_vec){
- fprintf(stderr, "and the unsatisfied dependencies are:\n");
- for(k = 0; k < dep_vec->len; k++){
- fprintf(stderr, "%s version %s\n",
dep_vec->pkgs[k]->name, dep_vec->pkgs[k]->version);
- }
- }
-
- fputs("", stdout);
-
- }
- }
- }
-
- pkg_hash_deinit(hash);
-
- return 0;
-}
Added: trunk/src/target/opkg/tests/Makefile.am
===================================================================
--- trunk/src/target/opkg/tests/Makefile.am 2008-02-11 05:29:48 UTC (rev
4048)
+++ trunk/src/target/opkg/tests/Makefile.am 2008-02-11 10:28:29 UTC (rev
4049)
@@ -0,0 +1,12 @@
+
+noinst_PROGRAMS = opkg_hash_test opkg_extract_test
+
+opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
+opkg_hash_test_SOURCES = opkg_hash_test.c
+opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_builddir)
+
+opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
+opkg_extract_test_SOURCES = opkg_extract_test.c
+opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_builddir)
+
+
Copied: trunk/src/target/opkg/tests/opkg_extract_test.c (from rev 4048,
trunk/src/target/opkg/libopkg/opkg_extract_test.c)
Copied: trunk/src/target/opkg/tests/opkg_hash_test.c (from rev 4048,
trunk/src/target/opkg/libopkg/opkg_hash_test.c)
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-02-11 11:30:22 +0100 (Mon, 11 Feb 2008)
New Revision: 4050
Removed:
trunk/src/target/opkg/etc/
Modified:
trunk/src/target/opkg/Makefile.am
trunk/src/target/opkg/configure.ac
Log:
opkg: remove redundant etc directory
Modified: trunk/src/target/opkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/Makefile.am 2008-02-11 10:28:29 UTC (rev 4049)
+++ trunk/src/target/opkg/Makefile.am 2008-02-11 10:30:22 UTC (rev 4050)
@@ -1,4 +1,4 @@
-SUBDIRS = etc familiar libbb libopkg tests src
+SUBDIRS = familiar libbb libopkg tests src
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
Modified: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/opkg/configure.ac 2008-02-11 10:28:29 UTC (rev 4049)
+++ trunk/src/target/opkg/configure.ac 2008-02-11 10:30:22 UTC (rev 4050)
@@ -131,7 +131,6 @@
libopkg/Makefile
tests/Makefile
src/Makefile
- etc/Makefile
familiar/Makefile
familiar/control
familiar/control-unstripped
--- End Message ---
--- Begin Message ---
Author: thomas
Date: 2008-02-11 11:50:32 +0100 (Mon, 11 Feb 2008)
New Revision: 4051
Modified:
trunk/src/target/opkg/configure.ac
trunk/src/target/opkg/libopkg/Makefile.am
trunk/src/target/opkg/src/opkg-frontend.c
trunk/src/target/opkg/tests/Makefile.am
trunk/src/target/opkg/tests/opkg_extract_test.c
trunk/src/target/opkg/tests/opkg_hash_test.c
Log:
opkg: distcheck fixes
Modified: trunk/src/target/opkg/configure.ac
===================================================================
--- trunk/src/target/opkg/configure.ac 2008-02-11 10:30:22 UTC (rev 4050)
+++ trunk/src/target/opkg/configure.ac 2008-02-11 10:50:32 UTC (rev 4051)
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script
-AC_INIT(libopkg/opkg.c)
+AC_INIT(libopkg/libopkg.c)
AM_INIT_AUTOMAKE([opkg], [0.99.163])
AM_CONFIG_HEADER(libopkg/config.h)
Modified: trunk/src/target/opkg/libopkg/Makefile.am
===================================================================
--- trunk/src/target/opkg/libopkg/Makefile.am 2008-02-11 10:30:22 UTC (rev
4050)
+++ trunk/src/target/opkg/libopkg/Makefile.am 2008-02-11 10:50:32 UTC (rev
4051)
@@ -1,5 +1,5 @@
-ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@[EMAIL PROTECTED]" [EMAIL PROTECTED]@
-DLIBDIR=\"@[EMAIL PROTECTED]" -DOPKGLIBDIR=\"@[EMAIL PROTECTED]"
-DDATADIR=\"@[EMAIL PROTECTED]" -I$(top_builddir)
+ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@[EMAIL PROTECTED]" [EMAIL PROTECTED]@
-DLIBDIR=\"@[EMAIL PROTECTED]" -DOPKGLIBDIR=\"@[EMAIL PROTECTED]"
-DDATADIR=\"@[EMAIL PROTECTED]" -I$(top_srcdir)
libopkg_includedir=$(includedir)/libopkg
Modified: trunk/src/target/opkg/src/opkg-frontend.c
===================================================================
--- trunk/src/target/opkg/src/opkg-frontend.c 2008-02-11 10:30:22 UTC (rev
4050)
+++ trunk/src/target/opkg/src/opkg-frontend.c 2008-02-11 10:50:32 UTC (rev
4051)
@@ -18,7 +18,7 @@
*/
-#include "libopkg.h"
+#include <libopkg/libopkg.h>
/* This is really small, eh? ;-) */
Modified: trunk/src/target/opkg/tests/Makefile.am
===================================================================
--- trunk/src/target/opkg/tests/Makefile.am 2008-02-11 10:30:22 UTC (rev
4050)
+++ trunk/src/target/opkg/tests/Makefile.am 2008-02-11 10:50:32 UTC (rev
4051)
@@ -3,10 +3,10 @@
opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
opkg_hash_test_SOURCES = opkg_hash_test.c
-opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_builddir)
+opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la
$(top_builddir)/libopkg/libopkg.la
opkg_extract_test_SOURCES = opkg_extract_test.c
-opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_builddir)
+opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir)
Modified: trunk/src/target/opkg/tests/opkg_extract_test.c
===================================================================
--- trunk/src/target/opkg/tests/opkg_extract_test.c 2008-02-11 10:30:22 UTC
(rev 4050)
+++ trunk/src/target/opkg/tests/opkg_extract_test.c 2008-02-11 10:50:32 UTC
(rev 4051)
@@ -1,6 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "libbb/libbb.h"
+#include <libbb/libbb.h>
/*
* build thus:
Modified: trunk/src/target/opkg/tests/opkg_hash_test.c
===================================================================
--- trunk/src/target/opkg/tests/opkg_hash_test.c 2008-02-11 10:30:22 UTC
(rev 4050)
+++ trunk/src/target/opkg/tests/opkg_hash_test.c 2008-02-11 10:50:32 UTC
(rev 4051)
@@ -15,11 +15,11 @@
General Public License for more details.
*/
-#include "opkg.h"
+#include <libopkg/opkg.h>
-#include "hash_table.h"
-#include "opkg_utils.h"
-#include "pkg_hash.h"
+#include <libopkg/hash_table.h>
+#include <libopkg/opkg_utils.h>
+#include <libopkg/pkg_hash.h>
int main(int argc, char *argv[])
{
--- End Message ---
_______________________________________________
commitlog mailing list
commitlog@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/commitlog
