summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pehjota>2014-09-02 11:41:19 (EDT)
committer P. J. McDermott <pj@pehjota.net>2014-09-02 11:41:19 (EDT)
commit680e280d200f71d885ac111376f7019a43f0a265 (patch)
treebbec40ea57bb427c74addc9f4b523440f26be243
parenteaf9bd8d87e9a3e0c99680909cfce0ec65219f6b (diff)
doc/pkg/basic-expat: Update architecture
s/core-linux-eglibc/amd64-linux-glibc/
-rw-r--r--doc/pkg/basic-expat.mdwn64
1 files changed, 32 insertions, 32 deletions
diff --git a/doc/pkg/basic-expat.mdwn b/doc/pkg/basic-expat.mdwn
index 85dbd5b..e2a1d44 100644
--- a/doc/pkg/basic-expat.mdwn
+++ b/doc/pkg/basic-expat.mdwn
@@ -256,7 +256,7 @@ Splitting Files Into Binary Packages
Look in the *installation destination directory* `tmp/dest/` for files installed
by Expat's build system. This can be done with the **find**(1) command, which
-results in the following when building for the `core-linux-eglibc` architecture:
+results in the following when building for the `amd64-linux-glibc` architecture:
$ find tmp/dest -exec ls -Fd '{}' ';' | sed 's|^tmp/dest||'
/
@@ -268,14 +268,14 @@ results in the following when building for the `core-linux-eglibc` architecture:
/usr/share/man/man1/
/usr/share/man/man1/xmlwf.1
/usr/lib/
- /usr/lib/core-linux-eglibc/
- /usr/lib/core-linux-eglibc/pkgconfig/
- /usr/lib/core-linux-eglibc/pkgconfig/expat.pc
- /usr/lib/core-linux-eglibc/libexpat.so@
- /usr/lib/core-linux-eglibc/libexpat.a
- /usr/lib/core-linux-eglibc/libexpat.la*
- /usr/lib/core-linux-eglibc/libexpat.so.1@
- /usr/lib/core-linux-eglibc/libexpat.so.1.6.0*
+ /usr/lib/amd64-linux-glibc/
+ /usr/lib/amd64-linux-glibc/pkgconfig/
+ /usr/lib/amd64-linux-glibc/pkgconfig/expat.pc
+ /usr/lib/amd64-linux-glibc/libexpat.so@
+ /usr/lib/amd64-linux-glibc/libexpat.a
+ /usr/lib/amd64-linux-glibc/libexpat.la*
+ /usr/lib/amd64-linux-glibc/libexpat.so.1@
+ /usr/lib/amd64-linux-glibc/libexpat.so.1.6.0*
/usr/include/
/usr/include/expat_external.h
/usr/include/expat.h
@@ -293,7 +293,7 @@ one for the utility's documentation.
To find out what we should call the library package, we can use **objdump**(1)
to get the *SONAME* of the library:
- $ objdump -p tmp/dest/usr/lib/core-linux-eglibc/libexpat.so.1.6.0 | grep SONAME
+ $ objdump -p tmp/dest/usr/lib/amd64-linux-glibc/libexpat.so.1.6.0 | grep SONAME
SONAME libexpat.so.1
We should name our library package after the SONAME of the shared library,
@@ -394,8 +394,8 @@ Again, let's start with `libexpat.1`. We can write the following pattern in
/usr/lib/*/libexpat.so.*
-This will match `/usr/lib/core-linux-eglibc/libexpat.so.1` and
-`/usr/lib/core-linux-eglibc/libexpat.so.1.6.0`; these two files will be provided
+This will match `/usr/lib/amd64-linux-glibc/libexpat.so.1` and
+`/usr/lib/amd64-linux-glibc/libexpat.so.1.6.0`; these two files will be provided
by `libexpat.1`.
The patterns for `libexpat.1-dev` are a little more complicated:
@@ -447,17 +447,17 @@ You can verify that all files were installed where they should be:
tmp/libexpat.1.data/
tmp/libexpat.1.data/usr/
tmp/libexpat.1.data/usr/lib/
- tmp/libexpat.1.data/usr/lib/core-linux-eglibc/
- tmp/libexpat.1.data/usr/lib/core-linux-eglibc/libexpat.so.1@
- tmp/libexpat.1.data/usr/lib/core-linux-eglibc/libexpat.so.1.6.0*
+ tmp/libexpat.1.data/usr/lib/amd64-linux-glibc/
+ tmp/libexpat.1.data/usr/lib/amd64-linux-glibc/libexpat.so.1@
+ tmp/libexpat.1.data/usr/lib/amd64-linux-glibc/libexpat.so.1.6.0*
tmp/libexpat.1-dev.data/
tmp/libexpat.1-dev.data/usr/
tmp/libexpat.1-dev.data/usr/lib/
- tmp/libexpat.1-dev.data/usr/lib/core-linux-eglibc/
- tmp/libexpat.1-dev.data/usr/lib/core-linux-eglibc/pkgconfig/
- tmp/libexpat.1-dev.data/usr/lib/core-linux-eglibc/pkgconfig/expat.pc
- tmp/libexpat.1-dev.data/usr/lib/core-linux-eglibc/libexpat.so@
- tmp/libexpat.1-dev.data/usr/lib/core-linux-eglibc/libexpat.a
+ tmp/libexpat.1-dev.data/usr/lib/amd64-linux-glibc/
+ tmp/libexpat.1-dev.data/usr/lib/amd64-linux-glibc/pkgconfig/
+ tmp/libexpat.1-dev.data/usr/lib/amd64-linux-glibc/pkgconfig/expat.pc
+ tmp/libexpat.1-dev.data/usr/lib/amd64-linux-glibc/libexpat.so@
+ tmp/libexpat.1-dev.data/usr/lib/amd64-linux-glibc/libexpat.a
tmp/libexpat.1-dev.data/usr/include/
tmp/libexpat.1-dev.data/usr/include/expat_external.h
tmp/libexpat.1-dev.data/usr/include/expat.h
@@ -487,7 +487,7 @@ With **find**(1), we can see that this is the `libexpat.la` file that GNU
libtool generated.
$ find tmp/dest -type f -exec ls -Fd '{}' ';' | sed 's|^tmp/dest||'
- /usr/lib/core-linux-eglibc/libexpat.la*
+ /usr/lib/amd64-linux-glibc/libexpat.la*
We don't need this, and we can simply delete it in the `install` target.
@@ -500,8 +500,8 @@ correct permissions for us.
Finally, note that the executable and linkable objects are not stripped: they
contain all of their symbols, including those only needed for debugging.
- $ file tmp/libexpat.1.data/usr/lib/core-linux-eglibc/libexpat.so.1.6.0
- tmp/libexpat.1.data/usr/lib/core-linux-eglibc/libexpat.so.1.6.0: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, BuildID[sha1]=0x2d88e36feeb8245bfa2f63f2f0e9a9f8232f6d2c, not stripped
+ $ file tmp/libexpat.1.data/usr/lib/amd64-linux-glibc/libexpat.so.1.6.0
+ tmp/libexpat.1.data/usr/lib/amd64-linux-glibc/libexpat.so.1.6.0: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, BuildID[sha1]=0x2d88e36feeb8245bfa2f63f2f0e9a9f8232f6d2c, not stripped
$ file tmp/xmlwf.data/usr/bin/xmlwf
tmp/xmlwf.data/usr/bin/xmlwf: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.26, BuildID[sha1]=0xdb5f686930b13b8a5e7519efb446a2da14de9856, not stripped
@@ -720,10 +720,10 @@ source and binary packages and cleaning up automatically when we're done.
After that finishes, you should see the built packages in the parent directory.
$ ls -1 ../*.opk
- ../libexpat.1_2.1.0-2_core-linux-eglibc_all.opk
- ../libexpat.1-dev_2.1.0-2_core-linux-eglibc_all.opk
+ ../libexpat.1_2.1.0-2_amd64-linux-glibc_all.opk
+ ../libexpat.1-dev_2.1.0-2_amd64-linux-glibc_all.opk
../src-expat_2.1.0-2_src_all.opk
- ../xmlwf_2.1.0-2_core-linux-eglibc_all.opk
+ ../xmlwf_2.1.0-2_amd64-linux-glibc_all.opk
../xmlwf-doc_2.1.0-2_all_all.opk
`src-expat` is a *source binary package* – a binary package installable with the
@@ -734,11 +734,11 @@ You can use the **tar**(1) command to verify that the control information and
data files in packages look correct.
$ tar -xzO control.tar.gz \
- > <../libexpat.1_2.1.0-2_core-linux-eglibc_all.opk | tar -xzO ./control
+ > <../libexpat.1_2.1.0-2_amd64-linux-glibc_all.opk | tar -xzO ./control
Package: libexpat.1
Source: expat
Version: 2.1.0-2
- Architecture: core-linux-eglibc
+ Architecture: amd64-linux-glibc
Platform: all
Maintainer: "J. Random Hacker" <jrandom@example.com>
Installed-Size: 164
@@ -748,7 +748,7 @@ data files in packages look correct.
XML document (like start tags).
Homepage: http://expat.sourceforge.net/
$ tar -xzO data.tar.gz \
- > <../libexpat.1_2.1.0-2_core-linux-eglibc_all.opk | tar -tz
+ > <../libexpat.1_2.1.0-2_amd64-linux-glibc_all.opk | tar -tz
./
./usr/
./usr/share/
@@ -757,9 +757,9 @@ data files in packages look correct.
./usr/share/doc/libexpat.1/changelog.dist
./usr/share/doc/libexpat.1/copyright
./usr/lib/
- ./usr/lib/core-linux-eglibc/
- ./usr/lib/core-linux-eglibc/libexpat.so.1
- ./usr/lib/core-linux-eglibc/libexpat.so.1.6.0
+ ./usr/lib/amd64-linux-glibc/
+ ./usr/lib/amd64-linux-glibc/libexpat.so.1
+ ./usr/lib/amd64-linux-glibc/libexpat.so.1.6.0
Congratulations! You've made a source package that successfully builds four
binary packages!