diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-01-29 21:20:07 (EST) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-01-29 21:20:07 (EST) |
| commit | 9fe922131a398d47eb69ed5895d1b392684adbbe (patch) | |
| tree | 1fe4b4627abd0610b1d388d26acc57ce2e51e29b | |
| parent | 42c3aaa46c6a109351c8d4c40127205785248713 (diff) | |
Write correct "Architecture" to control files.
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/oh-gencontrol | 5 |
2 files changed, 4 insertions, 3 deletions
@@ -1,7 +1,7 @@ TODO: * Fix oh-strip. * Make oh-strip obey a missing '-l' option. - * Handle "Architecture" field in oh-gencontrol and oh-buildopk. + * Handle "Architecture" field in oh-buildopk. * Check on file ownership and modes. * Finish tar archive handling in opkhelper. * Build packages with copyright information and changelogs. [1][2] diff --git a/src/oh-gencontrol b/src/oh-gencontrol index c8209b6..a4062b2 100644 --- a/src/oh-gencontrol +++ b/src/oh-gencontrol @@ -20,6 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . @@LIBDIR@@/opkhelper/controlfields +. @@LIBDIR@@/opkhelper/architecture print_usage() { @@ -106,8 +107,8 @@ gen_control_bin() copy_required_field Source ${control} copy_required_field Version ${control} - # TODO: Handle architecture. - { printf 'Architecture: ' && oh_get_field ${binpkg} Architecture;} \ + # Handle architecture. + { printf 'Architecture: ' && oh_get_package_architecture ${binpkg};} \ >> ${control} [ ${?} -eq 1 ] && missing_field Architecture |