summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--src/oh-gencontrol5
2 files changed, 4 insertions, 3 deletions
diff --git a/TODO b/TODO
index 21b412d..ca09915 100644
--- a/TODO
+++ b/TODO
@@ -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