@@ -8,6 +8,7 @@ PKG_NAME:=profile-$(PROFILE_COMMUNITY)-$(PROFILE_NAME)
88define Package/$(PKG_NAME)/preinst
99# !/bin/sh
1010[ -z "$${IPKG_INSTROOT}" ] && exit 0
11+ [ -f "$${TOPDIR}/version" ] && exit 0
1112echo "# ######################################################################### Inside package $(PKG_NAME) preinst"
1213grep -q IB_MODIFIED_BY_$(PKG_NAME ) $${TOPDIR}/Makefile && exit 0
1314echo "# ######################################################################### Backup original Makefile"
@@ -25,7 +26,7 @@ echo "##########################################################################
2526need_run=0
2627for p in $(PKG_CONFLICTS ) ; do
2728 i=$$(echo $$p | sed 's|-||' )
28- echo "Verifing the removal of package: $${i}"
29+ echo "Verifying the removal of package: $${i}"
2930 present=$$(echo $$build_packages | sed 's|\s|\n|g' | grep $$i | grep -v "\-$$i" )
3031 removed=$$(echo $$build_packages | sed 's|\s|\n|g' | grep "\-$$i" )
3132 if [ -n "$${removed}" ]; then
@@ -41,12 +42,13 @@ for p in $(PKG_CONFLICTS); do
4142done
4243if [ $${need_run} = 0 ]; then
4344 echo "Continue build without hack"
45+ rm /tmp/hack_pkg_conflicts $${TOPDIR}/Makefile.orig
4446 cp $${TOPDIR}/Makefile.orig $${TOPDIR}/Makefile
4547 exit 0
4648fi
4749echo "# ######################################################################### Determine make's target"
48- R =$$(for cmd in $$(ls -l /proc/*/exe | grep make | sed 's|.*/proc/\(.*\ ) /exe.*|\1|' | tr '\n' ' ' | tr -d '\0' ) ; do cat "/proc/$${cmd}/cmdline"; done)
49- make_target=$$(echo "$${R }" | grep -q makemanifest && echo 'manifest' || echo 'image' )
50+ cmdline_args =$$(for cmd in $$(ls -l /proc/*/exe | grep make | sed 's|.*/proc/\(.*\ ) /exe.*|\1|' | tr '\n' ' ' | tr -d '\0' ) ; do cat "/proc/$${cmd}/cmdline"; done)
51+ make_target=$$(echo "$${cmdline_args }" | grep -q makemanifest && echo 'manifest' || echo 'image' )
5052echo "make_target: $${make_target}"
5153echo "# ######################################################################### Add PKG_CONFLICTS to be removed in the main Makefile"
5254sed -i 's|\($$(USER_PACKAGES ) \) \($$(BUILD_PACKAGES ) \)|\1 $(PKG_CONFLICTS ) \2|' $${TOPDIR}/Makefile
0 commit comments