Fixes #4744: Update Fusion Inventory to 2.3.6 for AIX builds #300
Conversation
|
@Kegeruneku, I think this is slightly missing the goal here. What we want to achieve, in the end, is a single branch that has Fusion 2.3.6 for AIX, and Fusion 2.2.* for other OSes. We are using a 2.10_aix branch in between, so that we don't break anything on the main 2.10 branch, but this branch will be merged into the main 2.10 branch in the near future. Therefore, we must not remove all patches relating to FusionInventory 2.2., but instead keep them living alongside 2.3.6 patches, and make sure to download *both versions. Do you understand, and can you amend please? |
|
Updated. Introduced a "patches" folder to ease patch management for rudder-agent |
|
Do not merge yet please. |
|
OK, ready to merge :) |
| cd $PWD/../../fusioninventory-agent-2.3.6 | ||
| else | ||
| cd $PWD/../../fusioninventory-agent-2.2.2 | ||
| fi |
There was a problem hiding this comment.
Can we please move the OS-specific logic out of this file, and keep it all in the .spec file? This would respect POLA a lot more... And avoid nasty debugging in the future, I think.
There was a problem hiding this comment.
Idea from chatting together: make the directory to build an argument to the perl-prepare.sh script.
Kegeruneku
changed the title
| @@ -78,6 +78,15 @@ localdepends: ./initial-promises ./detect_os.sh ./files ./fusioninventory-agent | |||
| # Fix a lsusb invocation that crashes some SLES machines | |||
| $(FIND) ./fusioninventory-agent -iname "USB.pm" -exec rm "{}" \; | |||
|
|
|||
| ./fusioninventory-agent-2.3.6: /usr/bin/wget | |||
| $(WGET) -O $(TMP_DIR)/fusion-2.3.6.tgz http://www.normation.com/tarball/FusionInventory-Agent-2.3.6.tar.gz | |||
There was a problem hiding this comment.
Please specify the original URL here
…on_to_2_3_6 Fixes #4744: Update Fusion Inventory to 2.3.6 for AIX builds
Ticket: http://www.rudder-project.org/redmine/issues/4744
To be merged in 2.10_aix