RE: [Xen-ia64-devel] [Patch] build pacth for acpi

["Magenheimer, Dan (HP Labs Fort Collins)" <dan.magenheimer@xxxxxx>]

Kevin is correct, it is a result of all of the file movement
that is necessary because Xen/x86 changes many files in
linux-sparse that do not need to be changed for Xen/ia64.
One of these is acpi/tables.c.

What I do is use two hg trees.  One is the master tree.  Never
build xenlinux in the master tree.  The other is the build tree
and is cloned from the master tree.  Never pull into the build tree,
just re-clone it if you need to get updates.

So:

# get master tree
cd $my_xen_dir
hg clone http://xenbits.xensource.com/ext/xen-ia64-unstable.hg

# to build
cd $my_xen_dir
hg clone xen-ia64-unstable.hg build.hg
cd build.hg
make

# to update to newer bits
cd $my_xen_dir/xen-ia64-unstable.hg
hg pull

# to build newer bits, remove tree and re-clone
cd $my_xen_dir
rm -fr build.hg
hg clone xen-ia64-unstable.hg build.hg
cd build.hg
make

# to do xen (not xenlinux) development
cd $my_xen_dir
hg clone xen-ia64-unstable.hg new_feature.hg
cd new_feature.hg/xen
## change xen files and make in xen directory
## but don't run make in new_feature.hg!
hg commit # commit xen changes
cd $my_xen_dir/new_feature.hg
hg push ../xen-ia64-unstable.hg

# to do xenlinux development (complicated)
cd $my_xen_dir
hg clone xen-ia64-unstable.hg new_feature.hg
cd new_feature.hg
## change xenlinux files. DON'T BUILD YET
## first record your changes because once you build,
## "hg diff" is confused by all the moved files
hg diff > ~/patches/my_xenlinux_feature.patch
cd $my_xen_dir/new_feature.hg
make
## xenlinux feature testing
cd $my_xen_dir/xen-ia64-unstable.hg
patch -p1 < ~/patches/my_xenlinux_feature.patch
hg commit # clone won't get new changes without commit
## now re-test to ensure your patch works as expected
cd $my_xen_dir
hg clone xen-ia64-unstable.hg new_feature.hg
cd new_feature.hg
make

====
I hope that helps!

Dan

> -----Original Message-----
> From: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx 
> [mailto:xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx] On Behalf 
> Of Tian, Kevin
> Sent: Tuesday, November 15, 2005 8:12 PM
> To: takebe_akio@xxxxxxxxxxxxxx; xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> Subject: RE: [Xen-ia64-devel] [Patch] build pacth for acpi
> 
> Hi, Akio,
>       I also saw such error sometime ago, and doubt it may be 
> from the chaos environment caused by directories move at 
> pre-build time. Usually a fresh clone always works for me.
> 
>       Specific to following acpi issue. Currently if 
> everything works well, 
> linux-2.6-xen-sparse/drivers/acpi/tables.c will be renamed to 
> tables.c.xen-x86 at build time. Then original linux acpi 
> tables.c will be used for ia64 and then you won't see 
> following error anymore related to fixmap. But as you may see 
> in xen-mkbuildtree-pre, such directory/file move may only 
> happen at absent of mm.xen-x86.
> 
>       So normally you'll have your tree working in first 
> fresh clone. Then you pull new changesets and checkout again. 
> Now because linux-2.6-xen-sparse/drivers/acpi/tables.c is 
> missing due to renamed in first build, a new tables.c (with 
> fixmap) will be created which won't be renamed again due to 
> existing mm.xen-x86.
> 
>       I have no clear idea now about the build process. A 
> simple way you can try is to remove all linux directories 
> (linux-2.6-xen-sparse, ref-linux-2.6.12, 
> pristine-linux-2.6.12, and linux-2.6.12-xen0) before you 
> check out new changesets. You may add it into rule of "make 
> clean" temporarily.
> 
> Thanks,
> Kevin
> 
> >-----Original Message-----
> >From: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx
> >[mailto:xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx] On Behalf Of
> >takebe_akio@xxxxxxxxxxxxxx
> >Sent: 2005å11æ16æ 10:54
> >To: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> >Subject: [Xen-ia64-devel] [Patch] build pacth for acpi
> >
> >Hi,
> >
> >I have the following error today.
> >Do anyone have the same error?
> >I tried to write a patch for fix acpi/table.c.
> >Could anyone check the following patch since I'm not 
> familiar with acpi?
> >
> >Error is below
> >=====================================
> >  CC      crypto/compress.o
> >  CC      crypto/proc.o
> >  CC      crypto/md5.o
> >  CC      crypto/des.o
> >  LD      crypto/built-in.o
> >  CC      drivers/acpi/tables.o
> >drivers/acpi/tables.c: In function `acpi_table_init':
> >drivers/acpi/tables.c:590: warning: implicit declaration of 
> function `__fix_to_virt'
> >drivers/acpi/tables.c:590: error: `FIX_ACPI_RSDP_PAGE' 
> undeclared (first use in
> >this function)
> >drivers/acpi/tables.c:590: error: (Each undeclared 
> identifier is reported only once
> >drivers/acpi/tables.c:590: error: for each function it appears in.)
> >make[6]: *** [drivers/acpi/tables.o] Error 1
> >make[5]: *** [drivers/acpi] Error 2
> >make[4]: *** [drivers] Error 2
> >make[4]: Leaving directory 
> `/root/xen-ia64-unstable.hg/linux-2.6.12-xen0'
> >make[3]: *** [build] Error 2
> >make[3]: Leaving directory `/root/xen-ia64-unstable.hg'
> >make[2]: *** [linux-2.6-xen0-install] Error 2
> >make[2]: Leaving directory `/root/xen-ia64-unstable.hg'
> >make[1]: *** [install-kernels] Error 1
> >make[1]: Leaving directory `/root/xen-ia64-unstable.hg'
> >make: *** [world] Error 2
> >
> >=====================================
> >
> >Patch is below.
> >=====================================
> >diff -r bd234c9603ce linux-2.6-xen-sparse/drivers/acpi/tables.c
> >--- a/linux-2.6-xen-sparse/drivers/acpi/tables.c        Fri 
> Nov 11 19:23:04 2005
> >+++ b/linux-2.6-xen-sparse/drivers/acpi/tables.c        Wed 
> Nov 16 11:38:24 2005
> >@@ -565,7 +565,7 @@
> >  *
> >  * result: sdt_entry[] is initialized
> >  */
> >-#if CONFIG_XEN
> >+#if CONFIG_XEN && ! __ia64__
> > #define acpi_rsdp_phys_to_va(rsdp_phys) 
> (__fix_to_virt(FIX_ACPI_RSDP_PAGE)
> >+ \
> >                                           (rsdp_phys & ~PAGE_MASK))
> > #else
> >
> >========================================
> >
> >
> >Best Regards,
> >
> >Akio Takebe
> >
> >_______________________________________________
> >Xen-ia64-devel mailing list
> >Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> >http://lists.xensource.com/xen-ia64-devel
> 
> _______________________________________________
> Xen-ia64-devel mailing list
> Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-ia64-devel
> 

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel