Skip to content

Commit

Permalink
package/opkg: move related code together
Browse files Browse the repository at this point in the history
In commit d31db33 (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 <[email protected]>
  • Loading branch information
yann-morin-1998 committed Oct 23, 2023
1 parent 10e6449 commit b3dd463
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions package/opkg/opkg.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand All @@ -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))

0 comments on commit b3dd463

Please sign in to comment.