diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/opkg/opkg.inc | 2 | ||||
| -rw-r--r-- | recipes/opkg/update-alternatives-merge.inc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index 20f415e3de..b317de4cc3 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -4,7 +4,7 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.1.6+svnr${SRCPV}" -INC_PR = "r19" +INC_PR = "r20" FILESPATHPKG =. "opkg:" diff --git a/recipes/opkg/update-alternatives-merge.inc b/recipes/opkg/update-alternatives-merge.inc index a07275d038..f129fdbe84 100644 --- a/recipes/opkg/update-alternatives-merge.inc +++ b/recipes/opkg/update-alternatives-merge.inc @@ -4,7 +4,8 @@ pkg_postinst_${PN}_append () { alternatives_dir_old="${prefix}/lib/ipkg/alternatives" alternatives_dir_new="${prefix}/lib/opkg/alternatives" - if [ -e "${alternatives_dir_old}" ] ; then + # if ${prefix}/lib/ipkg is already link (probably to ${prefix}/lib/opkg), then nothing needs to be merged and definitely we don't want "rm -rf ${alternatives_dir_old}" to happen + if [ ! -h ${prefix}/lib/ipkg -a -e "${alternatives_dir_old}" ] ; then if [ ! -e "${alternatives_dir_new}" ] ; then mkdir -p "${alternatives_dir_new}"; fi |