From b3dd46344251f822560624873a569c0a3e5ceb13 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 23 Oct 2023 19:00:14 +0200 Subject: [PATCH] package/opkg: move related code together In commit d31db334c3ad (opkg: Add gnupg signature checking support.), the macro definition for the hook, and the hook assignment, got separated by the then-newly introduced GPG handling. Move the macro definition closer to the hook assignment. Since this is a post-install hook, it is but logical that it comes further down in the .mk file. Signed-off-by: Yann E. MORIN --- package/opkg/opkg.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk index 9b1ffb3c74..e167ba4fc4 100644 --- a/package/opkg/opkg.mk +++ b/package/opkg/opkg.mk @@ -12,11 +12,6 @@ OPKG_LICENSE_FILES = COPYING OPKG_INSTALL_STAGING = YES OPKG_CONF_OPTS = --disable-curl --disable-zstd -# Ensure directory for lockfile exists -define OPKG_CREATE_LOCKDIR - mkdir -p $(TARGET_DIR)/usr/lib/opkg -endef - ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y) OPKG_CONF_OPTS += --enable-gpg OPKG_CONF_ENV += \ @@ -27,6 +22,10 @@ else OPKG_CONF_OPTS += --disable-gpg endif +# Ensure directory for lockfile exists +define OPKG_CREATE_LOCKDIR + mkdir -p $(TARGET_DIR)/usr/lib/opkg +endef OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR $(eval $(autotools-package))